[FFmpeg-cvslog] Merge commit '22e49e6edead9c83696f20127988f659b952ce65'
Derek Buitenhuis
git at videolan.org
Mon May 9 00:55:51 CEST 2016
ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun May 8 23:50:09 2016 +0100| [d62984d8a0816e05fb2d9dbe9c899a5563065074] | committer: Derek Buitenhuis
Merge commit '22e49e6edead9c83696f20127988f659b952ce65'
* commit '22e49e6edead9c83696f20127988f659b952ce65':
dds: Simplify postprocessing check
Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d62984d8a0816e05fb2d9dbe9c899a5563065074
---
libavcodec/dds.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/libavcodec/dds.c b/libavcodec/dds.c
index bd9b93b..5468a45 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. */
======================================================================
More information about the ffmpeg-cvslog
mailing list