ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Apr 29 19:09:05 2018 +0200| [9f73ae31e075104c7613d481a09a8b102e6449e9] | committer: Michael Niedermayer
avcodec/mpeg4videode: Eliminate out of loop VOP startcode reading for studio profile Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f73ae31e075104c7613d481a09a8b102e6449e9 --- libavcodec/mpeg4videodec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 9ee2f37c69..9318d7bd4e 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; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
