[FFmpeg-cvslog] Merge commit 'af11fa5409cc72fc45ca7f3527400beca10967b9'
Michael Niedermayer
git at videolan.org
Wed Sep 4 13:12:10 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 4 13:04:29 2013 +0200| [49f5519345d2cf803b082bca8a7c54a63a34865b] | committer: Michael Niedermayer
Merge commit 'af11fa5409cc72fc45ca7f3527400beca10967b9'
* commit 'af11fa5409cc72fc45ca7f3527400beca10967b9':
mjpegb: Detect changing number of planes in interlaced video
Conflicts:
libavcodec/mjpegdec.c
See: ecc31630f9a16ead4272a078c281afcb4db87f21
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49f5519345d2cf803b082bca8a7c54a63a34865b
---
More information about the ffmpeg-cvslog
mailing list