virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/mpeg4videode: Eliminate out of loop VOP startcode reading for studio profile

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2018-04-29 19:09:05 +02:00
parent ab834b8f36
commit 9f73ae31e0
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpeg4videodec.c
View File

@@ -2931,9 +2931,6 @@ static int decode_studio_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
if (get_bits_left(gb) <= 32) if (get_bits_left(gb) <= 32)
return 0; return 0;
if (get_bits_long(gb, 32) != VOP_STARTCODE)
return AVERROR_INVALIDDATA;
s->decode_mb = mpeg4_decode_studio_mb; s->decode_mb = mpeg4_decode_studio_mb;
decode_smpte_tc(ctx, gb); decode_smpte_tc(ctx, gb);
@@ -3183,7 +3180,6 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb)
if (s->studio_profile) { if (s->studio_profile) {
if ((ret = decode_studio_vol_header(ctx, gb)) < 0) if ((ret = decode_studio_vol_header(ctx, gb)) < 0)
return ret; return ret;
break;
} else { } else {
if ((ret = decode_vol_header(ctx, gb)) < 0) if ((ret = decode_vol_header(ctx, gb)) < 0)
return ret; return ret;