virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/mpeg12: Don't pretend reading dct_dc_size_* VLCs can fail

Browse Source 
It can't because the corresponding trees don't have any loose ends.

Removing the checks also removed an instance of av_log(NULL (with a
nonsense message) from the codebase.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-10-08 17:54:19 +02:00
parent c4990409f2
commit 7800cc6e82
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mdec.c
View File

@ -71,8 +71,6 @@ static inline int mdec_decode_block_intra(MDECContext *a, int16_t *block, int n)
} else { } else {
component = (n <= 3 ? 0 : n - 4 + 1); component = (n <= 3 ? 0 : n - 4 + 1);
diff = decode_dc(&a->gb, component); diff = decode_dc(&a->gb, component);
if (diff >= 0xffff)
return AVERROR_INVALIDDATA;
a->last_dc[component] += diff; a->last_dc[component] += diff;
block[0] = a->last_dc[component] * (1 << 3); block[0] = a->last_dc[component] * (1 << 3);
} }

4
libavcodec/mpeg12.h
View File

@ -47,10 +47,6 @@ static inline int decode_dc(GetBitContext *gb, int component)
} else { } else {
code = get_vlc2(gb, ff_dc_chroma_vlc.table, DC_VLC_BITS, 2); code = get_vlc2(gb, ff_dc_chroma_vlc.table, DC_VLC_BITS, 2);
} }
if (code < 0){
av_log(NULL, AV_LOG_ERROR, "invalid dc code at\n");
return 0xffff;
}
if (code == 0) { if (code == 0) {
diff = 0; diff = 0;
} else { } else {

4
libavcodec/mpeg12dec.c
View File

@ -490,8 +490,6 @@ static inline int mpeg2_decode_block_intra(MpegEncContext *s,
component = (n & 1) + 1; component = (n & 1) + 1;
} }
diff = decode_dc(&s->gb, component); diff = decode_dc(&s->gb, component);
if (diff >= 0xffff)
return AVERROR_INVALIDDATA;
dc = s->last_dc[component]; dc = s->last_dc[component];
dc += diff; dc += diff;
s->last_dc[component] = dc; s->last_dc[component] = dc;
@ -577,8 +575,6 @@ static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s,
component = (n & 1) + 1; component = (n & 1) + 1;
} }
diff = decode_dc(&s->gb, component); diff = decode_dc(&s->gb, component);
if (diff >= 0xffff)
return AVERROR_INVALIDDATA;
dc = s->last_dc[component]; dc = s->last_dc[component];
dc += diff; dc += diff;
s->last_dc[component] = dc; s->last_dc[component] = dc;