[FFmpeg-cvslog] 012v: remove double ; and return correct error code if ff_get_buffer() fails

Paul B Mahol git at videolan.org
Sat Jan 19 16:40:02 CET 2013


ffmpeg | branch: release/1.1 | Paul B Mahol <onemda at gmail.com> | Mon Jan  7 10:48:02 2013 +0000| [ccf0cd967d32084978a4346d608b44aec56b9d25] | committer: Michael Niedermayer

012v: remove double ; and return correct error code if ff_get_buffer() fails

Signed-off-by: Paul B Mahol <onemda at gmail.com>
(cherry picked from commit 25160236957647d81e8beecd6c8fb7f1949fc26e)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/012v.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/012v.c b/libavcodec/012v.c
index b2c2790..6f4533b 100644
--- a/libavcodec/012v.c
+++ b/libavcodec/012v.c
@@ -44,7 +44,7 @@ static av_cold int zero12v_decode_init(AVCodecContext *avctx)
 static int zero12v_decode_frame(AVCodecContext *avctx, void *data,
                                 int *got_frame, AVPacket *avpkt)
 {
-    int line = 0;
+    int line = 0, ret;
     const int width = avctx->width;
     AVFrame *pic = avctx->coded_frame;
     uint16_t *y, *u, *v;
@@ -65,8 +65,8 @@ static int zero12v_decode_frame(AVCodecContext *avctx, void *data,
     }
 
     pic->reference = 0;
-    if (ff_get_buffer(avctx, pic) < 0)
-        return AVERROR_INVALIDDATA;;
+    if ((ret = ff_get_buffer(avctx, pic)) < 0)
+        return ret;
 
     y = (uint16_t *)pic->data[0];
     u = (uint16_t *)pic->data[1];



More information about the ffmpeg-cvslog mailing list