mace: Make sure that the channel count is set to a valid value
authorMartin Storsjö <martin@martin.st>
Mon, 16 Sep 2013 12:19:52 +0000 (15:19 +0300)
committerLuca Barbato <lu_zero@gentoo.org>
Tue, 7 Jan 2014 08:43:56 +0000 (09:43 +0100)
commit48f27c854f23b43890f72239c5d18b7fff0707af
tree87aa077132bb61c32b2c744f9eb2e3824712a20d
parent802deb2d136fd2e2b6f445476703c05a0b633aa2
mace: Make sure that the channel count is set to a valid value

Also return a proper error code.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit e1f3847f860a1094a46be4c5f10db8df616c3135)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
libavcodec/mace.c
libavcodec/mace.c