]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/h263dec: use PIX_FMT_GRAY8 when the user specified CODEC_FLAG_GRAY
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 May 2015 23:10:25 +0000 (01:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 May 2015 23:13:55 +0000 (01:13 +0200)
Fixes Ticket4542

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h263dec.c

index 7c87f78379349a802a2b67c116fcaafbf5e0bcd6..c47f5b160ff65e42c254525ce61d1b0447877c90 100644 (file)
@@ -48,6 +48,9 @@ static enum AVPixelFormat h263_get_format(AVCodecContext *avctx)
     if (avctx->codec->id == AV_CODEC_ID_MSS2)
         return AV_PIX_FMT_YUV420P;
 
+    if (CONFIG_GRAY && (avctx->flags & CODEC_FLAG_GRAY))
+        return AV_PIX_FMT_GRAY8;
+
     return avctx->pix_fmt = ff_get_format(avctx, avctx->codec->pix_fmts);
 }