[FFmpeg-cvslog] Merge commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622'
Michael Niedermayer
git at videolan.org
Mon Jul 29 14:15:02 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 29 14:11:21 2013 +0200| [2f9e97b32a7a541095654bed2e8763dd79c98366] | committer: Michael Niedermayer
Merge commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622'
* commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622':
hls: Set stream offset before opening a chained demuxer
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f9e97b32a7a541095654bed2e8763dd79c98366
---
More information about the ffmpeg-cvslog
mailing list