ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Feb 21
01:07:37 2015 +0100| [0d6ae067660f6fbca524b9a77b857d3afc9f8030] | committer:
Michael Niedermayer
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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d6ae067660f6fbca524b9a77b857d3afc9f8030
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
