[SCM] libav/experimental: print more correct error messges

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:50:36 UTC 2013


The following commit has been merged in the experimental branch:
commit 7b95bc58426ee1ba73e74d3c078e1e81261c14a3
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Sep 8 08:27:51 2006 +0000

    print more correct error messges
    
    Originally committed as revision 6194 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 73fa7f4..1fbde20 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -2622,9 +2622,11 @@ retry:
         break;
     }
 
-    if(s->frame_size<=0 || s->frame_size < buf_size){
+    if(s->frame_size<=0 || s->frame_size > buf_size){
         av_log(avctx, AV_LOG_ERROR, "incomplete frame\n");
         return -1;
+    }else if(s->frame_size < buf_size){
+        av_log(avctx, AV_LOG_ERROR, "incorrect frame size\n");
     }
 
     out_size = mp_decode_frame(s, out_samples, buf, buf_size);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list