diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 11:21:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 11:21:41 +0200 |
| commit | 008ae91bcca7f9bc3ae5d04e92f925b0ab771f07 (patch) | |
| tree | 5d242936ad91b9f51b5ec26f5b166d06f0372abf /cmdutils.h | |
| parent | 2922ab7e6fecd56942323b27065c21f5332b0588 (diff) | |
| parent | 31a77177ff323ef83944c60a8654891213ab6691 (diff) | |
| download | ffmpeg-008ae91bcca7f9bc3ae5d04e92f925b0ab771f07.tar.gz | |
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>
Diffstat (limited to 'cmdutils.h')
0 files changed, 0 insertions, 0 deletions