diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-01-24 18:00:02 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-01-26 15:23:08 +0100 |
| commit | b05cebe60274bd300dd867111fe4a98006bb1503 (patch) | |
| tree | 5305927c9b06a702333ce6eb5a35ad7612e7fb47 | |
| parent | 0ebfd6485841e3b1e73b794065e05c2c0b36e984 (diff) | |
| download | ffmpeg-b05cebe60274bd300dd867111fe4a98006bb1503.tar.gz | |
lavc/h264: replace MAX_MMCO_COUNT with H264_MAX_MMCO_COUNT
They apparently serve the same purpose; the latter is one larger and has
a comment explaining how the value is derived, so seems more
trustworthy.
| -rw-r--r-- | libavcodec/h264_parser.c | 2 | ||||
| -rw-r--r-- | libavcodec/h264_refs.c | 2 | ||||
| -rw-r--r-- | libavcodec/h264dec.h | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 881cab7536..aee7cdb934 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -219,7 +219,7 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, if (get_bits1(gb)) { // adaptive_ref_pic_marking_mode_flag int i; - for (i = 0; i < MAX_MMCO_COUNT; i++) { + for (i = 0; i < H264_MAX_MMCO_COUNT; i++) { MMCOOpcode opcode = get_ue_golomb_31(gb); if (opcode > (unsigned) MMCO_LONG) { av_log(logctx, AV_LOG_ERROR, diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index dae8bd278a..93526b11e2 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -849,7 +849,7 @@ int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb, } else { sl->explicit_ref_marking = get_bits1(gb); if (sl->explicit_ref_marking) { - for (i = 0; i < MAX_MMCO_COUNT; i++) { + for (i = 0; i < FF_ARRAY_ELEMS(sl->mmco); i++) { MMCOOpcode opcode = get_ue_golomb_31(gb); mmco[i].opcode = opcode; diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index dffd723ba6..38a4e96e26 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -52,8 +52,6 @@ #define H264_MAX_PICTURE_COUNT 36 -#define MAX_MMCO_COUNT 66 - #define MAX_DELAYED_PIC_COUNT 16 /* Compiling in interlaced support reduces the speed @@ -330,7 +328,7 @@ typedef struct H264SliceContext { uint8_t cabac_state[1024]; int cabac_init_idc; - MMCO mmco[MAX_MMCO_COUNT]; + MMCO mmco[H264_MAX_MMCO_COUNT]; int nb_mmco; int explicit_ref_marking; @@ -489,7 +487,7 @@ typedef struct H264Context { /** * memory management control operations buffer. */ - MMCO mmco[MAX_MMCO_COUNT]; + MMCO mmco[H264_MAX_MMCO_COUNT]; int nb_mmco; int mmco_reset; int explicit_ref_marking; |