RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 09:52:17 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/apng: Remove blending support for AV_PIX_FMT_ARGB

Browse Source 
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>
This commit is contained in:
Donny Yang 2015-06-02 15:49:22 +00:00 committed by Michael Niedermayer
parent 02915602d9
commit 7495e728f5
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/pngdec.c
View File

@ -877,7 +877,7 @@ static int handle_p_frame_apng(AVCodecContext *avctx, PNGDecContext *s,
return ls; return ls;
if (s->blend_op == APNG_BLEND_OP_OVER && 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", avpriv_request_sample(avctx, "Blending with pixel format %s",
av_get_pix_fmt_name(avctx->pix_fmt)); av_get_pix_fmt_name(avctx->pix_fmt));
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
@ -902,11 +902,6 @@ static int handle_p_frame_apng(AVCodecContext *avctx, PNGDecContext *s,
gi = 1; gi = 1;
bi = 2; bi = 2;
ai = 3; ai = 3;
} else {
ri = 3;
gi = 2;
bi = 1;
ai = 0;
} }
for (j = s->y_offset; j < s->y_offset + s->cur_h; j++) { for (j = s->y_offset; j < s->y_offset + s->cur_h; j++) {