[FFmpeg-cvslog] Merge commit 'f875a732e36786d49f3650e3235272891a820600'

Michael Niedermayer git at videolan.org
Tue Sep 17 16:36:34 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 17 16:26:59 2013 +0200| [028f8c3ecb439899be02340bbede9472771e5392] | committer: Michael Niedermayer

Merge commit 'f875a732e36786d49f3650e3235272891a820600'

* commit 'f875a732e36786d49f3650e3235272891a820600':
  mpeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory

Conflicts:
	libavcodec/mpeg4videodec.c

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

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





More information about the ffmpeg-cvslog mailing list