[FFmpeg-devel] [PATCH] avcodec: remove special casing CACHED_BITSTREAM_READER
Michael Niedermayer
michael at niedermayer.cc
Mon Oct 23 01:08:30 EEST 2023
after the vlc multi cleanup patchset today i see no fate failure but i do not know
why exactly these special cases where there
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
libavcodec/magicyuv.c | 2 +-
libavcodec/utvideodec.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c
index 3f6348b531e..4a143cdbbf7 100644
--- a/libavcodec/magicyuv.c
+++ b/libavcodec/magicyuv.c
@@ -122,7 +122,7 @@ static void magicyuv_median_pred16(uint16_t *dst, const uint16_t *src1,
#define READ_PLANE(dst, plane, b, c) \
{ \
x = 0; \
- for (; CACHED_BITSTREAM_READER && x < width-c && get_bits_left(&gb) > 0;) {\
+ for (; x < width-c && get_bits_left(&gb) > 0;) {\
ret = get_vlc_multi(&gb, (uint8_t *)dst + x * b, multi, \
vlc, vlc_bits, 3); \
if (ret <= 0) \
diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c
index ce5d00f7af7..5697210276f 100644
--- a/libavcodec/utvideodec.c
+++ b/libavcodec/utvideodec.c
@@ -118,7 +118,7 @@ static int build_huff(UtvideoContext *c, const uint8_t *src, VLC *vlc,
{ \
buf = !use_pred ? dest : c->buffer; \
i = 0; \
- for (; CACHED_BITSTREAM_READER && i < width-end && get_bits_left(&gb) > 0;) {\
+ for (; i < width-end && get_bits_left(&gb) > 0;) {\
ret = get_vlc_multi(&gb, (uint8_t *)buf + i * b, multi.table, \
vlc.table, VLC_BITS, 3); \
if (ret > 0) \
--
2.17.1
More information about the ffmpeg-devel
mailing list