diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-25 10:51:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-25 10:51:19 +0200 |
| commit | 9328ae484338b70a7f2dbcd420bbbac499df76cc (patch) | |
| tree | 5c4dfb7bbbb37243899f75dcb839957d7d003591 | |
| parent | bad8f04b0454441edb0b7a1565e28c0b1a07f7ed (diff) | |
| parent | d9c89ef86b9400e50c2486f9406fad15c85bab22 (diff) | |
| download | ffmpeg-9328ae484338b70a7f2dbcd420bbbac499df76cc.tar.gz | |
Merge commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22'
* commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22':
cllc: Use outbuf in RGB and ARGB functions
cllc: Implement YUV support
Conflicts:
libavcodec/cllc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/cllc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c index ab8d46aa52..797d07b8ee 100644 --- a/libavcodec/cllc.c +++ b/libavcodec/cllc.c @@ -410,8 +410,11 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data, avctx->pix_fmt = AV_PIX_FMT_YUV422P; avctx->bits_per_raw_sample = 8; - if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) + ret = ff_get_buffer(avctx, pic, 0); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n"); return ret; + } ret = decode_yuv_frame(ctx, &gb, pic); if (ret < 0) |