[FFmpeg-cvslog] imc: return error codes instead of 0 for error conditions.

Justin Ruggles git at videolan.org
Thu Nov 3 02:23:13 CET 2011


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sat Oct 29 11:16:01 2011 -0400| [a4998e448f517a825fdc87e95e6c103223480867] | committer: Justin Ruggles

imc: return error codes instead of 0 for error conditions.

This fixes a bug where the whole buffer was returned as decoded audio due to
*data_size not being set to zero and the return value being >= 0.

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

 libavcodec/imc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index daa2857..1f1db6c 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -810,13 +810,13 @@ static int imc_decode_frame(AVCodecContext * avctx,
     if(imc_get_coeffs(q) < 0) {
         av_log(avctx, AV_LOG_ERROR, "Read coefficients failed\n");
         q->decoder_reset = 1;
-        return 0;
+        return AVERROR_INVALIDDATA;
     }
 
     if(inverse_quant_coeff(q, stream_format_code) < 0) {
         av_log(avctx, AV_LOG_ERROR, "Inverse quantization of coefficients failed\n");
         q->decoder_reset = 1;
-        return 0;
+        return AVERROR_INVALIDDATA;
     }
 
     memset(q->skipFlags, 0, sizeof(q->skipFlags));



More information about the ffmpeg-cvslog mailing list