Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / loco.c

diff --git a/libavcodec/loco.c b/libavcodec/loco.c
index eaf7e81cd49bd5beb3994dafdf74b794b7dc9a5d..9f14757612a405e7bc675040b5ae8d5c7997d8f6 100644 (file)
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@@ -210,7 +210,7 @@ static int decode_frame(AVCodecContext *avctx,
         decoded = loco_decode_plane(l, p->data[0] + p->linesize[0]*(avctx->height-1) + 2, avctx->width, avctx->height,
                                     -p->linesize[0], buf, buf_size, 3);
         break;
-    case LOCO_RGBA:
+    case LOCO_CRGBA: case LOCO_RGBA:
         decoded = loco_decode_plane(l, p->data[0], avctx->width, avctx->height,
                                     p->linesize[0], buf, buf_size, 4);
         buf += decoded; buf_size -= decoded;
@@ -299,5 +299,5 @@ AVCodec ff_loco_decoder = {
     .close          = decode_end,
     .decode         = decode_frame,
     .capabilities   = CODEC_CAP_DR1,
-    .long_name = NULL_IF_CONFIG_SMALL("LOCO"),
+    .long_name      = NULL_IF_CONFIG_SMALL("LOCO"),
 };