summaryrefslogtreecommitdiff
path: root/libavcodec/wmv2dec.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-10-30 12:58:31 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-11-06 17:41:26 +0100
commit8f7bf45895ced0b19295ba3d93470afa7d810f28 (patch)
tree9c2d7afad8470fec1a48e8ae752a79a957300c82 /libavcodec/wmv2dec.c
parent1669fe86313bbac94139ed403d5f4fcece872e14 (diff)
downloadffmpeg-8f7bf45895ced0b19295ba3d93470afa7d810f28.tar.gz
avcodec/vc1_block: Don't duplicate #defines
VC1 shares some VLCs with MSMPEG-4, but vc1_block.c simply duplicates the defines instead of including the appropriate headers; furthermore, use a proper prefix for these defines: DC_VLC_BITS is also used by other codecs. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/wmv2dec.c')
-rw-r--r--libavcodec/wmv2dec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index 2daf6c70e8..1209b1902d 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -482,7 +482,8 @@ static int wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64])
s->mb_intra = 1;
if (get_bits_left(&s->gb) <= 0)
return AVERROR_INVALIDDATA;
- code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);
+ code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table,
+ MSMP4_MB_INTRA_VLC_BITS, 2);
/* predict coded block pattern */
cbp = 0;
for (i = 0; i < 6; i++) {