diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-29 23:19:54 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-11-06 17:41:25 +0100 |
| commit | fdcd3dcf2ed6ad72773e17d160d04c55af67201b (patch) | |
| tree | b7cc03105450f41f4832b519f8b61d0d83a3946b | |
| parent | a07c8781ce7cbb9b28d788e9a8b7f79d5b975ebb (diff) | |
| download | ffmpeg-fdcd3dcf2ed6ad72773e17d160d04c55af67201b.tar.gz | |
avcodec/vc1: Don't check for AVCodecContext.codec
This check has been added in c617bed34f39a122ab1f89581ddce9cc63885383,
merging ee769c6a7c1d4ec6560f5e5a6f457b770b10fb33 to fix
a possible segfault if AVCodecContext.codec is not set
as it may be during parsing. While this fixes the segfault,
it has the unfortunate side effect that it makes the output
of the parser dependent on whether a decoder is set (and
ultimately available). The fix later applied in
5d2be71b9ecf2a88752666a2c4039f4d98419d35 does not have this
downside and makes checking AVCodecContext.codec superfluous.
So remove this check.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/vc1.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index c9257b290f..f6de8b9e75 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -632,8 +632,6 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) v->fcm = PROGRESSIVE; if (v->finterpflag) v->interpfrm = get_bits1(gb); - if (!v->s.avctx->codec) - return -1; if (v->s.avctx->codec_id == AV_CODEC_ID_MSS2) v->respic = v->rangered = |