[FFmpeg-cvslog] Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'

Michael Niedermayer git at videolan.org
Fri Dec 6 01:53:22 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 01:45:25 2013 +0100| [cf948200bd7083fb214bf7e1bd9ce3c82edd3303] | committer: Michael Niedermayer

Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'

* commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55':
  mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext

Conflicts:
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf948200bd7083fb214bf7e1bd9ce3c82edd3303
---





More information about the ffmpeg-cvslog mailing list