debian/patches: Drop 0001_fix_ftbfs_1041377.patch. Applied upstream.
This commit is contained in:
parent
057b4985ff
commit
5bbfde9671
32
debian/patches/0001_fix_ftbfs_1041377.patch
vendored
32
debian/patches/0001_fix_ftbfs_1041377.patch
vendored
@ -1,32 +0,0 @@
|
||||
diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
|
||||
index c14877b43ac1..215337464386 100644
|
||||
--- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
|
||||
+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
|
||||
@@ -235,8 +235,10 @@ static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYP
|
||||
}
|
||||
}
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
|
||||
if (mdecoder->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
|
||||
mdecoder->codec_context->flags |= AV_CODEC_FLAG_TRUNCATED;
|
||||
+#endif
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
diff --git a/libfreerdp/codec/h264_ffmpeg.c b/libfreerdp/codec/h264_ffmpeg.c
|
||||
index 4e3ba8f9282f..9c445b8253ae 100644
|
||||
--- a/libfreerdp/codec/h264_ffmpeg.c
|
||||
+++ b/libfreerdp/codec/h264_ffmpeg.c
|
||||
@@ -529,10 +529,12 @@ static BOOL libavcodec_init(H264_CONTEXT* h264)
|
||||
goto EXCEPTION;
|
||||
}
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
|
||||
if (sys->codecDecoder->capabilities & AV_CODEC_CAP_TRUNCATED)
|
||||
{
|
||||
sys->codecDecoderContext->flags |= AV_CODEC_FLAG_TRUNCATED;
|
||||
}
|
||||
+#endif
|
||||
|
||||
#ifdef WITH_VAAPI
|
||||
|
||||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -1 +0,0 @@
|
||||
0001_fix_ftbfs_1041377.patch
|
||||
Loading…
Reference in New Issue
Block a user