xaymar/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mjpegdec: remove buggy_avid field from MJpegDecodeContext

Browse Source 
This field has been unused since b6c04b6821.
This commit is contained in:
Ramiro Polla
2026-01-07 04:52:35 +01:00
parent af6a1dd0b2
commit 165448f7d1
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/mjpegdec.c
+1 -4
View File
@@ -100,7 +100,6 @@ static int init_default_huffman_tables(MJpegDecodeContext *s)
static void parse_avid(MJpegDecodeContext *s, uint8_t *buf, int len) static void parse_avid(MJpegDecodeContext *s, uint8_t *buf, int len)
{ {
s->buggy_avid = 1;
if (len > 12 && buf[12] == 1) /* 1 - NTSC */ if (len > 12 && buf[12] == 1) /* 1 - NTSC */
s->interlace_polarity = 1; s->interlace_polarity = 1;
if (len > 12 && buf[12] == 2) /* 2 - PAL */ if (len > 12 && buf[12] == 2) /* 2 - PAL */
@@ -1893,8 +1892,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
av_log(s->avctx, AV_LOG_DEBUG, "APPx (%s / %8X) len=%d\n", av_log(s->avctx, AV_LOG_DEBUG, "APPx (%s / %8X) len=%d\n",
av_fourcc2str(av_bswap32(id)), id, len); av_fourcc2str(av_bswap32(id)), id, len);
/* Buggy AVID, it puts EOI only at every 10th frame. */ /* This fourcc is used by non-avid files too, it holds some
/* Also, this fourcc is used by non-avid files too, it holds some
information, but it's always present in AVID-created files. */ information, but it's always present in AVID-created files. */
if (id == AV_RB32("AVI1")) { if (id == AV_RB32("AVI1")) {
/* structure: /* structure:
@@ -1904,7 +1902,6 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
4bytes field_size 4bytes field_size
4bytes field_size_less_padding 4bytes field_size_less_padding
*/ */
s->buggy_avid = 1;
if (len < 1) if (len < 1)
goto out; goto out;
i = bytestream2_get_byteu(&s->gB); len--; i = bytestream2_get_byteu(&s->gB); len--;
libavcodec/mjpegdec.h
-1
View File
@@ -127,7 +127,6 @@ typedef struct MJpegDecodeContext {
int restart_interval; int restart_interval;
int restart_count; int restart_count;
int buggy_avid;
int cs_itu601; int cs_itu601;
int interlace_polarity; int interlace_polarity;
int multiscope; int multiscope;