[FFmpeg-cvslog] Merge commit '3d9fc21e593aa89b5877bd739268499b079052f2'
Michael Niedermayer
git at videolan.org
Tue Dec 17 19:38:30 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 17 19:30:57 2013 +0100| [d6acf45ec280be866698966947a0887841a6ea20] | committer: Michael Niedermayer
Merge commit '3d9fc21e593aa89b5877bd739268499b079052f2'
* commit '3d9fc21e593aa89b5877bd739268499b079052f2':
h264: Refactor decode_frame_packing_arrangement
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6acf45ec280be866698966947a0887841a6ea20
---
More information about the ffmpeg-cvslog
mailing list