diff options
| author | Donny Yang <work@kota.moe> | 2015-06-02 15:49:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-03 01:42:57 +0200 |
| commit | 7495e728f5a21bb1619789f12227dcdb1baf65ee (patch) | |
| tree | 845e53c908bd6ab5c0931ddf1e10cfdc4dc27dce /libavcodec/pngdec.c | |
| parent | 02915602d9313aa4b108342a3081244b9d2422bf (diff) | |
| download | ffmpeg-7495e728f5a21bb1619789f12227dcdb1baf65ee.tar.gz | |
avcodec/apng: Remove blending support for AV_PIX_FMT_ARGB
ARGB is not a supported PNG pixel format
Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pngdec.c')
| -rw-r--r-- | libavcodec/pngdec.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 251279968b..5fa428b272 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -877,7 +877,7 @@ static int handle_p_frame_apng(AVCodecContext *avctx, PNGDecContext *s, return ls; if (s->blend_op == APNG_BLEND_OP_OVER && - avctx->pix_fmt != AV_PIX_FMT_RGBA && avctx->pix_fmt != AV_PIX_FMT_ARGB) { + avctx->pix_fmt != AV_PIX_FMT_RGBA) { avpriv_request_sample(avctx, "Blending with pixel format %s", av_get_pix_fmt_name(avctx->pix_fmt)); return AVERROR_PATCHWELCOME; @@ -902,11 +902,6 @@ static int handle_p_frame_apng(AVCodecContext *avctx, PNGDecContext *s, gi = 1; bi = 2; ai = 3; - } else { - ri = 3; - gi = 2; - bi = 1; - ai = 0; } for (j = s->y_offset; j < s->y_offset + s->cur_h; j++) { |