[FFmpeg-cvslog] wnv1: return more meaningful error codes

Paul B Mahol git at videolan.org
Sat Dec 1 11:28:33 CET 2012


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Dec  1 09:51:52 2012 +0000| [679c7578a6673148ca447b395f1e447a62f7bb92] | committer: Paul B Mahol

wnv1: return more meaningful error codes

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

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

diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c
index 22a570c..494dc98 100644
--- a/libavcodec/wnv1.c
+++ b/libavcodec/wnv1.c
@@ -66,7 +66,7 @@ static int decode_frame(AVCodecContext *avctx,
     WNV1Context * const l = avctx->priv_data;
     AVFrame * const p = &l->pic;
     unsigned char *Y,*U,*V;
-    int i, j;
+    int i, j, ret;
     int prev_y = 0, prev_u = 0, prev_v = 0;
     uint8_t *rbuf;
 
@@ -78,17 +78,17 @@ static int decode_frame(AVCodecContext *avctx,
     rbuf = av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
     if(!rbuf){
         av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer\n");
-        return -1;
+        return AVERROR(ENOMEM);
     }
 
     if(p->data[0])
         avctx->release_buffer(avctx, p);
 
     p->reference = 0;
-    if(avctx->get_buffer(avctx, p) < 0){
+    if ((ret = avctx->get_buffer(avctx, p)) < 0) {
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         av_free(rbuf);
-        return -1;
+        return ret;
     }
     p->key_frame = 1;
 



More information about the ffmpeg-cvslog mailing list