From b53d8c3ccfeff77874f5ca7c68136b6d87a0a69c Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 1 Aug 2016 20:21:04 +0200 Subject: [PATCH] mjpegdec: Drop disabled code --- libavcodec/mjpegdec.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 1f36b393a8..c670f357c9 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1215,17 +1215,9 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) s->bottom_field = 1; else if (i == 1) s->bottom_field = 0; -#if 0 - skip_bits(&s->gb, 8); - skip_bits(&s->gb, 32); - skip_bits(&s->gb, 32); - len -= 10; -#endif goto out; } -// len -= 2; - if (id == AV_RL32("JFIF")) { int t_w, t_h, v1, v2; skip_bits(&s->gb, 8); /* the trailing zero-byte */ @@ -1297,16 +1289,6 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) len -= 4; /* Apple MJPEG-A */ if (id == AV_RL32("mjpg")) { -#if 0 - skip_bits(&s->gb, 32); /* field size */ - skip_bits(&s->gb, 32); /* pad field size */ - skip_bits(&s->gb, 32); /* next off */ - skip_bits(&s->gb, 32); /* quant off */ - skip_bits(&s->gb, 32); /* huff off */ - skip_bits(&s->gb, 32); /* image off */ - skip_bits(&s->gb, 32); /* scan off */ - skip_bits(&s->gb, 32); /* data off */ -#endif if (s->avctx->debug & FF_DEBUG_PICT_INFO) av_log(s->avctx, AV_LOG_INFO, "mjpeg: Apple MJPEG-A header found\n"); }