From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4C23B468E5 for ; Sun, 22 Oct 2023 22:08:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2AFF468CA0F; Mon, 23 Oct 2023 01:08:38 +0300 (EEST) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF33768C959 for ; Mon, 23 Oct 2023 01:08:31 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 24306240006 for ; Sun, 22 Oct 2023 22:08:30 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 23 Oct 2023 00:08:30 +0200 Message-Id: <20231022220830.17954-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avcodec: remove special casing CACHED_BITSTREAM_READER X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 --- 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 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".