[FFmpeg-cvslog] r210dec: return meaningful error codes.

Anton Khirnov git at videolan.org
Mon Jan 7 01:34:15 CET 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Nov 17 15:31:35 2012 +0100| [39039f24051e4efcf00a5b13a772085f1e34d6f4] | committer: Anton Khirnov

r210dec: return meaningful error codes.

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

 libavcodec/r210dec.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c
index fd6d521..7fd663b 100644
--- a/libavcodec/r210dec.c
+++ b/libavcodec/r210dec.c
@@ -38,7 +38,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
                         AVPacket *avpkt)
 {
-    int h, w;
+    int h, w, ret;
     AVFrame *pic = avctx->coded_frame;
     const uint32_t *src = (const uint32_t *)avpkt->data;
     int aligned_width = FFALIGN(avctx->width, 64);
@@ -49,12 +49,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 
     if (avpkt->size < 4 * aligned_width * avctx->height) {
         av_log(avctx, AV_LOG_ERROR, "packet too small\n");
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
 
     pic->reference = 0;
-    if (ff_get_buffer(avctx, pic) < 0)
-        return -1;
+    if ((ret = ff_get_buffer(avctx, pic)) < 0)
+        return ret;
 
     pic->pict_type = AV_PICTURE_TYPE_I;
     pic->key_frame = 1;



More information about the ffmpeg-cvslog mailing list