Merge commit '22e49e6edead9c83696f20127988f659b952ce65'

* commit '22e49e6edead9c83696f20127988f659b952ce65': dds: Simplify postprocessing check Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago · d62984d8a0
parent 6ebec1049e 22e49e6ede
commit d62984d8a0
1 changed files with 1 additions and 5 deletions
--- a/libavcodec/dds.c
+++ b/libavcodec/dds.c
@ -702,11 +702,7 @@ static int dds_decode(AVCodecContext *avctx, void *data,
    }

    /* Run any post processing here if needed. */
-    if (avctx->pix_fmt == AV_PIX_FMT_BGRA ||
-        avctx->pix_fmt == AV_PIX_FMT_RGBA ||
-        avctx->pix_fmt == AV_PIX_FMT_RGB0 ||
-        avctx->pix_fmt == AV_PIX_FMT_BGR0 ||
-        avctx->pix_fmt == AV_PIX_FMT_YA8)
+    if (ctx->postproc != DDS_NONE)
        run_postproc(avctx, frame);

    /* Frame is ready to be output. */