[FFmpeg-cvslog] avcodec/cllc: Fix clobbered ff_get_buffer() change

Michael Niedermayer git at videolan.org
Wed Jun 26 01:22:47 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 26 01:16:09 2013 +0200| [d3788558b00084aa3e7bae2d76f668de5db05341] | committer: Michael Niedermayer

avcodec/cllc: Fix clobbered ff_get_buffer() change

Issue-since: 9328ae484338b70a7f2dbcd420bbbac499df76cc

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

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

 libavcodec/cllc.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c
index 797d07b..ab8d46a 100644
--- a/libavcodec/cllc.c
+++ b/libavcodec/cllc.c
@@ -410,11 +410,8 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
         avctx->pix_fmt             = AV_PIX_FMT_YUV422P;
         avctx->bits_per_raw_sample = 8;
 
-        ret = ff_get_buffer(avctx, pic, 0);
-        if (ret < 0) {
-            av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
+        if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
             return ret;
-        }
 
         ret = decode_yuv_frame(ctx, &gb, pic);
         if (ret < 0)



More information about the ffmpeg-cvslog mailing list