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>

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)