aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-18 00:22:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-18 00:23:17 +0100
commit4aed4f58465fa0d6940ce72c0dad90caab3ed36e (patch)
treeb4ae9770a5c6994c321c843cda6e242f4079c891
parente1d7d4bd13cdd8856a3611d1ea387ac733a7aebf (diff)
downloadffmpeg-4aed4f58465fa0d6940ce72c0dad90caab3ed36e.tar.gz
mlpdec: dont leave a invalid huff_lsb in the context.
Fix assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mlpdec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index c7de13c15c..6d27417106 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -720,6 +720,7 @@ static int read_channel_params(MLPDecodeContext *m, unsigned int substr,
if (cp->huff_lsbs > 24) {
av_log(m->avctx, AV_LOG_ERROR, "Invalid huff_lsbs.\n");
+ cp->huff_lsbs = 0;
return AVERROR_INVALIDDATA;
}