Skip to content

Commit

Permalink
avcodec/h264_ps: Remove ALLOW_INTERLACED cruft
Browse files Browse the repository at this point in the history
Since e1027ab,
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>
  • Loading branch information
mkver committed Jan 29, 2022
1 parent 937bb6b commit f0a7db1
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions libavcodec/h264_ps.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f0a7db1

Please sign in to comment.