Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

mjpeg_decode_com: remove redundant len checks

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/18/head
Michael Niedermayer 12 years ago
parent 2f75dcdc1c
commit 73b9f31c74
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libavcodec/mjpegdec.c

6
libavcodec/mjpegdec.c
Unescape View File

@ -1501,14 +1501,14 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
av_log(s->avctx, AV_LOG_INFO, "comment: '%s'\n", cbuf); av_log(s->avctx, AV_LOG_INFO, "comment: '%s'\n", cbuf);
/* buggy avid, it puts EOI only at every 10th frame */ /* buggy avid, it puts EOI only at every 10th frame */
if (len > 3 && (!strncmp(cbuf, "AVID", 4))) { if (!strncmp(cbuf, "AVID", 4)) {
s->buggy_avid = 1; s->buggy_avid = 1;
if (len > 14 && cbuf[12] == 1) /* 1 - NTSC, 2 - PAL */ if (len > 14 && cbuf[12] == 1) /* 1 - NTSC, 2 - PAL */
s->interlace_polarity = 1; s->interlace_polarity = 1;
} else if (!strcmp(cbuf, "CS=ITU601")) } else if (!strcmp(cbuf, "CS=ITU601"))
s->cs_itu601 = 1; s->cs_itu601 = 1;
else if ((len > 31 && !strncmp(cbuf, "Intel(R) JPEG Library, version 1", 32)) || else if ((!strncmp(cbuf, "Intel(R) JPEG Library, version 1", 32)) ||
(len > 19 && !strncmp(cbuf, "Metasoft MJPEG Codec", 20))) (!strncmp(cbuf, "Metasoft MJPEG Codec", 20)))
s->flipped = 1; s->flipped = 1;
av_free(cbuf); av_free(cbuf);

Write Preview
Loading…
Cancel
Save