[FFmpeg-soc] [soc]: r3806 - in dirac/libavcodec: dirac.c diracdec.c

conrad subversion at mplayerhq.hu
Tue Nov 11 09:37:58 CET 2008


Author: conrad
Date: Tue Nov 11 09:37:58 2008
New Revision: 3806

Log:
avcodec_check_dimensions already writes an error message, no need to write another


Modified:
   dirac/libavcodec/dirac.c
   dirac/libavcodec/diracdec.c

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Tue Nov 11 09:37:58 2008
@@ -1129,7 +1129,6 @@ int dirac_motion_compensation(DiracConte
     }
 
     if (avcodec_check_dimensions(s->avctx, s->refwidth, s->refheight)) {
-        av_log(s->avctx, AV_LOG_ERROR, "avcodec_check_dimensions() failed\n");
         return -1;
     }
 
@@ -1157,7 +1156,6 @@ int dirac_motion_compensation(DiracConte
         for (i = 0; i < s->refs; i++)
             av_free(s->refdata[i]);
 
-        av_log(s->avctx, AV_LOG_ERROR, "avcodec_check_dimensions() failed\n");
         return -1;
     }
 

Modified: dirac/libavcodec/diracdec.c
==============================================================================
--- dirac/libavcodec/diracdec.c	(original)
+++ dirac/libavcodec/diracdec.c	Tue Nov 11 09:37:58 2008
@@ -646,7 +646,6 @@ static int dirac_decode_frame_internal(D
 
     if (avcodec_check_dimensions(s->avctx, s->padded_luma_width,
                                  s->padded_luma_height)) {
-        av_log(s->avctx, AV_LOG_ERROR, "avcodec_check_dimensions() failed\n");
         return -1;
     }
 
@@ -888,8 +887,6 @@ int dirac_decode_frame(AVCodecContext *a
 
     if (avcodec_check_dimensions(avctx, s->source.luma_width,
                                  s->source.luma_height)) {
-        av_log(avctx, AV_LOG_ERROR,
-               "avcodec_check_dimensions() failed\n");
         return -1;
     }
 



More information about the FFmpeg-soc mailing list