[FFmpeg-cvslog] avcodec/apng: Remove blending support for AV_PIX_FMT_ARGB
Donny Yang
git at videolan.org
Wed Jun 3 01:52:09 CEST 2015
ffmpeg | branch: master | Donny Yang <work at kota.moe> | Tue Jun 2 15:49:22 2015 +0000| [7495e728f5a21bb1619789f12227dcdb1baf65ee] | committer: Michael Niedermayer
avcodec/apng: Remove blending support for AV_PIX_FMT_ARGB
ARGB is not a supported PNG pixel format
Signed-off-by: Donny Yang <work at kota.moe>
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7495e728f5a21bb1619789f12227dcdb1baf65ee
---
libavcodec/pngdec.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 2512799..5fa428b 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++) {
More information about the ffmpeg-cvslog
mailing list