virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-13 21:26:33 +02:00
Code Issues Releases Activity

mjpegdec: Drop disabled code

Browse Source
This commit is contained in:
Diego Biurrun 2016-08-01 20:21:04 +02:00
parent 34c22a9ca6
commit b53d8c3ccf
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/mjpegdec.c
View File

@ -1215,17 +1215,9 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
s->bottom_field = 1; s->bottom_field = 1;
else if (i == 1) else if (i == 1)
s->bottom_field = 0; 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; goto out;
} }
// len -= 2;
if (id == AV_RL32("JFIF")) { if (id == AV_RL32("JFIF")) {
int t_w, t_h, v1, v2; int t_w, t_h, v1, v2;
skip_bits(&s->gb, 8); /* the trailing zero-byte */ skip_bits(&s->gb, 8); /* the trailing zero-byte */
@ -1297,16 +1289,6 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
len -= 4; len -= 4;
/* Apple MJPEG-A */ /* Apple MJPEG-A */
if (id == AV_RL32("mjpg")) { 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) if (s->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(s->avctx, AV_LOG_INFO, "mjpeg: Apple MJPEG-A header found\n"); av_log(s->avctx, AV_LOG_INFO, "mjpeg: Apple MJPEG-A header found\n");
} }