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

Anton Khirnov git at videolan.org
Mon Jan 14 14:49:06 CET 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Nov 17 17:52:52 2012 +0100| [6bf70127d1d49f2a8c46803eda7b893b2b479282] | committer: Anton Khirnov

tmv: return meaningful error codes.

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

 libavcodec/tmv.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c
index d4e5aa1..29d8e15 100644
--- a/libavcodec/tmv.c
+++ b/libavcodec/tmv.c
@@ -47,20 +47,21 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data,
     unsigned char_cols = avctx->width >> 3;
     unsigned char_rows = avctx->height >> 3;
     unsigned x, y, fg, bg, c;
+    int ret;
 
     if (tmv->pic.data[0])
         avctx->release_buffer(avctx, &tmv->pic);
 
-    if (ff_get_buffer(avctx, &tmv->pic) < 0) {
+    if ((ret = ff_get_buffer(avctx, &tmv->pic)) < 0) {
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
-        return -1;
+        return ret;
     }
 
     if (avpkt->size < 2*char_rows*char_cols) {
         av_log(avctx, AV_LOG_ERROR,
                "Input buffer too small, truncated sample?\n");
         *got_frame = 0;
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
 
     tmv->pic.pict_type = AV_PICTURE_TYPE_I;



More information about the ffmpeg-cvslog mailing list