[FFmpeg-cvslog] msmpeg4: ignore negative DC overflow

Michael Niedermayer git at videolan.org
Tue Apr 9 16:40:13 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  9 16:27:49 2013 +0200| [b4eb06d32535958d71568503cf886f448a5164ed] | committer: Michael Niedermayer

msmpeg4: ignore negative DC overflow

Fixes second half of Ticket2414

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4eb06d32535958d71568503cf886f448a5164ed
---

 libavcodec/msmpeg4dec.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index 586c41c..768b520 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];



More information about the ffmpeg-cvslog mailing list