eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-23 15:30:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
4c17e20ff05a2ec14a1e76a4ed63894e4fb93095
ffmpeg/libavformat/iff.c
Michael Niedermayer 008ae91bcc Merge commit '31a77177ff323ef83944c60a8654891213ab6691' into release/1.1 
* commit '31a77177ff323ef83944c60a8654891213ab6691':
  iff: validate CMAP palette size

Conflicts:
	libavformat/iff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-12 11:21:41 +02:00

18 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink