diff options
| author | Benoit Fouet <benoit.fouet@free.fr> | 2014-11-28 14:03:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 15:51:31 +0100 |
| commit | af8804ac86383160c80671c3dcd511510f639f24 (patch) | |
| tree | 9baf2f028b40e2d973068df3e936d4fe4e5f11fe /libavcodec/pngdec.c | |
| parent | aff50ae1d176edacf7ff3fb24db9d25ebe9a4b2e (diff) | |
| download | ffmpeg-af8804ac86383160c80671c3dcd511510f639f24.tar.gz | |
avcodec/pngdec: allow for some code path optimizations.
Use 'if (CONFIG_APNG_DECODER)' where needed, so that the compiler can
optimize out some portion of code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pngdec.c')
| -rw-r--r-- | libavcodec/pngdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index da852c4100..a330d36c2d 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -949,7 +949,7 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, for (;;) { length = bytestream2_get_bytes_left(&s->gb); if (length <= 0) { - if (avctx->codec_id == AV_CODEC_ID_APNG && length == 0) { + if (CONFIG_APNG_DECODER && avctx->codec_id == AV_CODEC_ID_APNG && length == 0) { if (!(s->state & PNG_IDAT)) return 0; else @@ -984,14 +984,14 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, goto fail; break; case MKTAG('f', 'c', 'T', 'L'): - if (avctx->codec_id != AV_CODEC_ID_APNG) + if (!CONFIG_APNG_DECODER || avctx->codec_id != AV_CODEC_ID_APNG) goto skip_tag; if ((ret = decode_fctl_chunk(avctx, s, length)) < 0) goto fail; decode_next_dat = 1; break; case MKTAG('f', 'd', 'A', 'T'): - if (avctx->codec_id != AV_CODEC_ID_APNG) + if (!CONFIG_APNG_DECODER || avctx->codec_id != AV_CODEC_ID_APNG) goto skip_tag; if (!decode_next_dat) goto fail; @@ -999,7 +999,7 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, length -= 4; /* fallthrough */ case MKTAG('I', 'D', 'A', 'T'): - if (avctx->codec_id == AV_CODEC_ID_APNG && !decode_next_dat) + if (CONFIG_APNG_DECODER && avctx->codec_id == AV_CODEC_ID_APNG && !decode_next_dat) goto skip_tag; if (decode_idat_chunk(avctx, s, length, p) < 0) goto fail; |