[FFmpeg-cvslog] Merge commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4'
Michael Niedermayer
git at videolan.org
Thu Jan 29 22:01:53 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 29 21:55:02 2015 +0100| [c2ad22ff9934eb9324ad8be98f0f5790e4947859] | committer: Michael Niedermayer
Merge commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4'
* commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4':
yuv4mpegdec: initialize field_order in yuv4_read_header()
Conflicts:
libavformat/yuv4mpegdec.c
See: 52a17972defa118705a4020a6d0bb3ad277df819
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2ad22ff9934eb9324ad8be98f0f5790e4947859
---
More information about the ffmpeg-cvslog
mailing list