aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-09 16:27:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-09 16:27:49 +0200
commitb4eb06d32535958d71568503cf886f448a5164ed (patch)
treebb3ec9c4583ea28d76b10f4b19cb3208f20592fa /libavcodec
parentc03dc44070cd57f4375e45ac4d5663de3bc0642a (diff)
downloadffmpeg-b4eb06d32535958d71568503cf886f448a5164ed.tar.gz
msmpeg4: ignore negative DC overflow
Fixes second half of Ticket2414 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/msmpeg4dec.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index 586c41c2b2..768b52059f 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -653,7 +653,6 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block,
if (level < 0){
av_log(s->avctx, AV_LOG_ERROR, "dc overflow- block: %d qscale: %d//\n", n, s->qscale);
if(s->inter_intra_pred) level=0;
- else return -1;
}
if (n < 4) {
rl = &ff_rl_table[s->rl_table_index];