32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
From 98ccdd2f4263eb1590c65f175c11deeec18fe6c2 Mon Sep 17 00:00:00 2001
|
|
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
Date: Fri, 3 Mar 2023 19:33:04 +0100
|
|
Subject: [PATCH] Fix build with ffmpeg 6.0
|
|
|
|
This feature was removed from ffmpeg:
|
|
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=add33e370d241d947209c914de1bf062fe44d58e
|
|
---
|
|
src/stream/FFmpegStream.cpp | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/src/stream/FFmpegStream.cpp b/src/stream/FFmpegStream.cpp
|
|
index 341062ed..0996b446 100644
|
|
--- a/src/stream/FFmpegStream.cpp
|
|
+++ b/src/stream/FFmpegStream.cpp
|
|
@@ -920,7 +920,6 @@ bool FFmpegStream::OpenWithFFmpeg(const AVInputFormat* iformat, const AVIOInterr
|
|
// We only process this condition for manifest streams when this setting is disabled
|
|
if (!kodi::addon::GetSettingBoolean("useFastOpenForManifestStreams") || m_manifestType.empty())
|
|
{
|
|
- m_pFormatContext->flags |= AVFMT_FLAG_PRIV_OPT;
|
|
if (avformat_open_input(&m_pFormatContext, strFile.c_str(), iformat, &options) < 0)
|
|
{
|
|
Log(LOGLEVEL_DEBUG, "Error, could not open file %s", CURL::GetRedacted(strFile).c_str());
|
|
@@ -935,7 +934,6 @@ bool FFmpegStream::OpenWithFFmpeg(const AVInputFormat* iformat, const AVIOInterr
|
|
}
|
|
|
|
m_pFormatContext->interrupt_callback = int_cb;
|
|
- m_pFormatContext->flags &= ~AVFMT_FLAG_PRIV_OPT;
|
|
options = GetFFMpegOptionsFromInput();
|
|
av_dict_set_int(&options, "load_all_variants", 0, AV_OPT_SEARCH_CHILDREN);
|
|
|