[FFmpeg-cvslog] Merge commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c'
Michael Niedermayer
git at videolan.org
Thu Oct 11 14:32:11 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 11 14:28:18 2012 +0200| [b6c3487e7f2f8f0d8fae9df023c46ed3112c7443] | committer: Michael Niedermayer
Merge commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c'
* commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c':
vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures
segment: support applehttp style list
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6c3487e7f2f8f0d8fae9df023c46ed3112c7443
---
More information about the ffmpeg-cvslog
mailing list