diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-01-27 16:39:26 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-01-29 20:35:05 +0100 |
| commit | f0a7db12a28b4f1675b1b8e125d92024fd98d239 (patch) | |
| tree | bf428b488d10cde28f05d09e53120f6af9974b07 | |
| parent | 937bb6bbc1e8654633737e69e403e95a37113058 (diff) | |
| download | ffmpeg-f0a7db12a28b4f1675b1b8e125d92024fd98d239.tar.gz | |
avcodec/h264_ps: Remove ALLOW_INTERLACED cruft
Since e1027aba680c4382c103fd1100cc5567a1530abc,
ALLOW_INTERLACED is no longer defined in h264_ps.c,
leading to a warning when encountering an SPS compatible
with MBAFF. This warning was always nonsense, because
ff_h264_decode_seq_parameter_set() is also used by the parser
and it makes no sense for the parser to warn about missing
decoder features; after all, it is not a parser's job
to warn when a feature is unsupported by a decoder
(and in this case it is even weirder, because even if the H.264
decoder is disabled, the warning will only be shown for MBAFF
sequence parameter sets). So remove the warning in h264_ps.c.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/h264_ps.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index f68d5bf81c..6927fa7198 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -517,11 +517,6 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, sps->direct_8x8_inference_flag = get_bits1(gb); -#ifndef ALLOW_INTERLACE - if (sps->mb_aff) - av_log(avctx, AV_LOG_ERROR, - "MBAFF support not included; enable it at compile-time.\n"); -#endif sps->crop = get_bits1(gb); if (sps->crop) { unsigned int crop_left = get_ue_golomb(gb); |