[FFmpeg-cvslog] lavc/hevcdec: drop an always-zero variable
Anton Khirnov
git at videolan.org
Tue Jun 11 18:50:50 EEST 2024
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Jun 1 12:43:42 2024 +0200| [8eb134f4f9449fef6f1a992361e46a7f321f3b1d] | committer: Anton Khirnov
lavc/hevcdec: drop an always-zero variable
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8eb134f4f9449fef6f1a992361e46a7f321f3b1d
---
libavcodec/hevc/hevcdec.c | 9 ++-------
libavcodec/hevc/hevcdec.h | 1 -
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c
index 6dda923df5..d599373c9d 100644
--- a/libavcodec/hevc/hevcdec.c
+++ b/libavcodec/hevc/hevcdec.c
@@ -984,13 +984,9 @@ static int hls_slice_header(HEVCContext *s, GetBitContext *gb)
unsigned val = get_bits_long(gb, offset_len);
sh->entry_point_offset[i] = val + 1; // +1; // +1 to get the size
}
- if (s->threads_number > 1 && (pps->num_tile_rows > 1 || pps->num_tile_columns > 1)) {
- s->enable_parallel_tiles = 0; // TODO: you can enable tiles in parallel here
+ if (s->threads_number > 1 && (pps->num_tile_rows > 1 || pps->num_tile_columns > 1))
s->threads_number = 1;
- } else
- s->enable_parallel_tiles = 0;
- } else
- s->enable_parallel_tiles = 0;
+ }
}
if (pps->slice_header_extension_present_flag) {
@@ -3697,7 +3693,6 @@ static av_cold int hevc_decode_init(AVCodecContext *avctx)
if (ret < 0)
return ret;
- s->enable_parallel_tiles = 0;
s->sei.picture_timing.picture_struct = 0;
s->eos = 1;
diff --git a/libavcodec/hevc/hevcdec.h b/libavcodec/hevc/hevcdec.h
index 3b7442e5c1..c58ce05639 100644
--- a/libavcodec/hevc/hevcdec.h
+++ b/libavcodec/hevc/hevcdec.h
@@ -532,7 +532,6 @@ typedef struct HEVCContext {
/** The target for the common_cabac_state of the local contexts. */
HEVCCABACState cabac;
- int enable_parallel_tiles;
atomic_int wpp_err;
const uint8_t *data;
More information about the ffmpeg-cvslog
mailing list