diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-03 00:27:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-04 12:11:36 +0200 |
| commit | bd27a9364ca274ca97f1df6d984e88a0700fb235 (patch) | |
| tree | a428799eee676771eece2d8743d4e83abfb8b85d /libavcodec/mpeg4videodec.c | |
| parent | 3b10bb8772c76177cc47b8d15a6970f19dd11039 (diff) | |
avcodec/mpeg4videodec: Remove use of FF_PROFILE_MPEG4_SIMPLE_STUDIO as indicator of studio profile
The profile field is changed by code inside and outside the decoder,
its not a reliable indicator of the internal codec state.
Maintaining it consistency with studio_profile is messy.
Its easier to just avoid it and use only studio_profile
Fixes: assertion failure
Fixes: ffmpeg_crash_9.avi
Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 54a8496244..2df525e03a 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3244,7 +3244,6 @@ end: s->avctx->has_b_frames = !s->low_delay; if (s->studio_profile) { - av_assert0(s->avctx->profile == FF_PROFILE_MPEG4_SIMPLE_STUDIO); if (!s->avctx->bits_per_raw_sample) { av_log(s->avctx, AV_LOG_ERROR, "Missing VOL header\n"); return AVERROR_INVALIDDATA; |