Merge commit 'ff48ae94f90f6862dbe5b1e7397a1bda3150e200'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 00:07:37 +0000 (01:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 00:07:58 +0000 (01:07 +0100)
commit0d6ae067660f6fbca524b9a77b857d3afc9f8030
tree0b5238e3778c5f188e83c4a0d821e7db2099ab24
parentc0e3b461185cee5e8624337e75a263e74543e15d
parentff48ae94f90f6862dbe5b1e7397a1bda3150e200
Merge commit 'ff48ae94f90f6862dbe5b1e7397a1bda3150e200'

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

Conflicts:
libavformat/hlsenc.c

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