Merge commit '31a77177ff323ef83944c60a8654891213ab6691' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 09:21:41 +0000 (11:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 09:21:41 +0000 (11:21 +0200)
commit008ae91bcca7f9bc3ae5d04e92f925b0ab771f07
tree5d242936ad91b9f51b5ec26f5b166d06f0372abf
parent2922ab7e6fecd56942323b27065c21f5332b0588
parent31a77177ff323ef83944c60a8654891213ab6691
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>
libavformat/iff.c