From 86620bd84b872b76db0acafec167949dca03a29e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= Date: Tue, 7 Nov 2023 10:43:11 +0100 Subject: [PATCH] Fix build with ffmpeg 6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zoltán Böszörményi --- torchvision/csrc/io/decoder/stream.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/torchvision/csrc/io/decoder/stream.cpp b/torchvision/csrc/io/decoder/stream.cpp index 0d625ef211c..8c914050587 100644 --- a/torchvision/csrc/io/decoder/stream.cpp +++ b/torchvision/csrc/io/decoder/stream.cpp @@ -63,15 +63,8 @@ int Stream::openCodec(std::vector* metadata, int num_threads) { codecCtx_->thread_count = num_threads; } else { // otherwise set sensible defaults - // with the special case for the different MPEG4 codecs - // that don't have threading context functions - if (codecCtx_->codec->capabilities & AV_CODEC_CAP_INTRA_ONLY) { - codecCtx_->thread_type = FF_THREAD_FRAME; - codecCtx_->thread_count = 2; - } else { - codecCtx_->thread_count = 8; - codecCtx_->thread_type = FF_THREAD_SLICE; - } + codecCtx_->thread_count = 8; + codecCtx_->thread_type = FF_THREAD_SLICE; } int ret;