diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-04-29 19:09:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-06-15 22:31:13 +0200 |
| commit | 786834a6934e81f266908b30fc0633efe82e6449 (patch) | |
| tree | 64cdd5f014a73876c13ef6b5ebd03392d08a736a /libavcodec/mpeg4videodec.c | |
| parent | f2c253f083aa2d997604b0aaf7a0199532db96bb (diff) | |
| download | ffmpeg-786834a6934e81f266908b30fc0633efe82e6449.tar.gz | |
avcodec/mpeg4videode: Eliminate out of loop VOP startcode reading for studio profile
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9f73ae31e075104c7613d481a09a8b102e6449e9)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 561ee2fa33..490f9fe046 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2931,9 +2931,6 @@ static int decode_studio_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) if (get_bits_left(gb) <= 32) return 0; - if (get_bits_long(gb, 32) != VOP_STARTCODE) - return AVERROR_INVALIDDATA; - s->decode_mb = mpeg4_decode_studio_mb; decode_smpte_tc(ctx, gb); @@ -3183,7 +3180,6 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb) if (s->studio_profile) { if ((ret = decode_studio_vol_header(ctx, gb)) < 0) return ret; - break; } else { if ((ret = decode_vol_header(ctx, gb)) < 0) return ret; |