diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 23:50:09 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 23:50:09 +0100 |
| commit | d62984d8a0816e05fb2d9dbe9c899a5563065074 (patch) | |
| tree | ea3f35f9d3cef11046f545130e78ed3a0ebe3cb6 | |
| parent | 6ebec1049ea66b252dc89ade2bf78560629aea1f (diff) | |
| parent | 22e49e6edead9c83696f20127988f659b952ce65 (diff) | |
| download | ffmpeg-d62984d8a0816e05fb2d9dbe9c899a5563065074.tar.gz | |
Merge commit '22e49e6edead9c83696f20127988f659b952ce65'
* commit '22e49e6edead9c83696f20127988f659b952ce65':
dds: Simplify postprocessing check
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavcodec/dds.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/dds.c b/libavcodec/dds.c index bd9b93bdee..5468a453af 100644 --- 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. */ |