virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '22e49e6edead9c83696f20127988f659b952ce65'

Browse Source 
* commit '22e49e6edead9c83696f20127988f659b952ce65':
  dds: Simplify postprocessing check

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2016-05-08 23:50:09 +01:00
parent 6ebec1049e 22e49e6ede
commit d62984d8a0
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dds.c
View File

@@ -702,11 +702,7 @@ static int dds_decode(AVCodecContext *avctx, void *data,
} }
/* Run any post processing here if needed. */ /* Run any post processing here if needed. */
if (avctx->pix_fmt == AV_PIX_FMT_BGRA || if (ctx->postproc != DDS_NONE)
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)
run_postproc(avctx, frame); run_postproc(avctx, frame);
/* Frame is ready to be output. */ /* Frame is ready to be output. */