diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-03 01:27:04 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-04 13:11:36 +0300 |
| commit | bd27a9364ca274ca97f1df6d984e88a0700fb235 (patch) | |
| tree | a428799eee676771eece2d8743d4e83abfb8b85d /libavcodec/error_resilience.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/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 339042e206..1abae53f41 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -814,8 +814,7 @@ static int er_supported(ERContext *s) { if(s->avctx->hwaccel && s->avctx->hwaccel->decode_slice || !s->cur_pic.f || - s->cur_pic.field_picture || - s->avctx->profile == FF_PROFILE_MPEG4_SIMPLE_STUDIO + s->cur_pic.field_picture ) return 0; return 1; |