[FFmpeg-cvslog] Merge commit '5b10ef729f610fcbc9c485e7b643ce53268144cb'
Michael Niedermayer
git at videolan.org
Mon Dec 9 22:05:01 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 9 21:53:23 2013 +0100| [be6e81463c72dda837d62ef0a7c26f35a666d1d3] | committer: Michael Niedermayer
Merge commit '5b10ef729f610fcbc9c485e7b643ce53268144cb'
* commit '5b10ef729f610fcbc9c485e7b643ce53268144cb':
h264: parse frame packing arrangement SEI messages and save relevant stereo3d information
Conflicts:
libavcodec/h264.c
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be6e81463c72dda837d62ef0a7c26f35a666d1d3
---
More information about the ffmpeg-cvslog
mailing list