[FFmpeg-cvslog] Merge commit 'c453723ad7d14abc5e82677eebaa6025fa598f08'

Michael Niedermayer git at videolan.org
Fri Nov 22 11:05:35 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 22 10:56:42 2013 +0100| [8b2578ab452fe2dac09d5df56897f5ecf1602e22] | committer: Michael Niedermayer

Merge commit 'c453723ad7d14abc5e82677eebaa6025fa598f08'

* commit 'c453723ad7d14abc5e82677eebaa6025fa598f08':
  gifdec: check that the image dimensions are non-zero

Conflicts:
	libavcodec/gifdec.c

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

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





More information about the ffmpeg-cvslog mailing list