summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2013-01-18 00:22:39 +0100
committerMichael Niedermayer <[email protected]>2013-02-14 11:48:25 +0100
commite1a86b1433f1ea39a1197b2353afad8e88e51009 (patch)
tree7d9ac3f005f56724e2b2e9f8f77e6cc5b07dc41f
parent02d3ad8609573a4b0069e57df03646ec3d92fdf1 (diff)
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 <[email protected]> (cherry picked from commit 4aed4f58465fa0d6940ce72c0dad90caab3ed36e) Signed-off-by: Michael Niedermayer <[email protected]>
-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;
}