[FFmpeg-cvslog] Merge commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e'
Michael Niedermayer
git at videolan.org
Mon Feb 17 21:10:47 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 17 20:59:51 2014 +0100| [27f55beba2bf9c94996660556543dce1b3ed04b1] | committer: Michael Niedermayer
Merge commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e'
* commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e':
h264: use avpriv_request_sample for chroma_format_idc
Conflicts:
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27f55beba2bf9c94996660556543dce1b3ed04b1
---
More information about the ffmpeg-cvslog
mailing list