Merge commit 'ff48ae94f90f6862dbe5b1e7397a1bda3150e200'

Browse Source

* commit 'ff48ae94f90f6862dbe5b1e7397a1bda3150e200':
  hlsenc: remove the AVIOContext for the playlist from the muxer context

Conflicts:
	libavformat/hlsenc.c

See: 28bf05e7b5
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2015-02-21 01:07:37 +01:00

parent c0e3b46118 ff48ae94f9

commit 0d6ae06766

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available