diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@googlemail.com> | 2019-03-11 11:32:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-12 00:48:56 +0100 |
| commit | 3f086a2f665f9906e0f6197cddbfacc2f4b093a1 (patch) | |
| tree | 03ea635dc6c568f53acf611cf6f6a33808b405b5 /libavcodec/h263dec.c | |
| parent | 5ab44ff20cdc0e05adecbd0cd352d25fcb930094 (diff) | |
| download | ffmpeg-3f086a2f665f9906e0f6197cddbfacc2f4b093a1.tar.gz | |
avcodec/mpeg4videodec: Fix nonsense warning
Since db772308941a2a338c7809f90d347219a6a93074 parsing of
mpeg4-extradata lead to a "Failed to parse extradata" warning, because
ff_mpeg4_decode_picture_header returns AVERROR_INVALIDDATA in case that
no VOP was found. This patch adds a parameter to signify whether a
header (where the absence of a VOP does not raise an error) or not is
parsed. The first mode is of course used for parsing headers.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 2cf01e3d98..8385ddfe2e 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -500,9 +500,9 @@ retry: GetBitContext gb; if (init_get_bits8(&gb, s->avctx->extradata, s->avctx->extradata_size) >= 0 ) - ff_mpeg4_decode_picture_header(avctx->priv_data, &gb); + ff_mpeg4_decode_picture_header(avctx->priv_data, &gb, 1); } - ret = ff_mpeg4_decode_picture_header(avctx->priv_data, &s->gb); + ret = ff_mpeg4_decode_picture_header(avctx->priv_data, &s->gb, 0); } else if (CONFIG_H263I_DECODER && s->codec_id == AV_CODEC_ID_H263I) { ret = ff_intel_h263_decode_picture_header(s); } else if (CONFIG_FLV_DECODER && s->h263_flv) { |