[FFmpeg-cvslog] Merge commit '31a77177ff323ef83944c60a8654891213ab6691' into release/1.1

Michael Niedermayer git at videolan.org
Sun May 12 11:59:57 CEST 2013


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 11:21:41 2013 +0200| [008ae91bcca7f9bc3ae5d04e92f925b0ab771f07] | committer: Michael Niedermayer

Merge commit '31a77177ff323ef83944c60a8654891213ab6691' into release/1.1

* commit '31a77177ff323ef83944c60a8654891213ab6691':
  iff: validate CMAP palette size

Conflicts:
	libavformat/iff.c

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

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





More information about the ffmpeg-cvslog mailing list