From df6b9f06569b24919183e51d726e2c3b28a73f1f Mon Sep 17 00:00:00 2001
From: atraczyk <andreastraczyk@gmail.com>
Date: Wed, 23 Aug 2017 15:05:26 -0400
Subject: [PATCH] contrib(UWP): bump ffmpeg to 3.3.2
Change-Id: Ia2adeffb087c0e2a7ddd0db1d1a3d93768814a22
Reviewed-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
---
contrib/src/ffmpeg/fetch_and_patch.bat | 4 ++--
contrib/src/ffmpeg/ffmpeg-uwp.patch | 11 -----------
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/contrib/src/ffmpeg/fetch_and_patch.bat b/contrib/src/ffmpeg/fetch_and_patch.bat
index e844e57ccb..ae59f32477 100644
--- a/contrib/src/ffmpeg/fetch_and_patch.bat
+++ b/contrib/src/ffmpeg/fetch_and_patch.bat
@@ -1,6 +1,6 @@
set BUILD=%SRC%..\build
-set FFMPEGINTEROP_VERSION=6f8062f68176a23d4cbc953668677edb07fd7984
+set FFMPEGINTEROP_VERSION=10879040235da3a2393ff19a7a6dc3d7f791314a
set FFMPEGINTEROP_URL=https://github.com/Microsoft/FFmpegInterop/archive/%FFMPEGINTEROP_VERSION%.tar.gz
mkdir %BUILD%
@@ -19,7 +19,7 @@ cd %BUILD%\FFmpegInterop
rmdir /s /q ffmpeg
-set FFMPEG_VERSION=12320c08221f0eecf6d9af3a6f12f42e656f0674
+set FFMPEG_VERSION=6d7192bcb7bbab17dc194e8dbb56c208bced0a92
set FFMPEG_URL=https://github.com/FFmpeg/FFmpeg/archive/%FFMPEG_VERSION%.tar.gz
if %USE_CACHE%==1 (
diff --git a/contrib/src/ffmpeg/ffmpeg-uwp.patch b/contrib/src/ffmpeg/ffmpeg-uwp.patch
index 3c03f3c51e..2c502a7a3d 100644
--- a/contrib/src/ffmpeg/ffmpeg-uwp.patch
+++ b/contrib/src/ffmpeg/ffmpeg-uwp.patch
@@ -92,17 +92,6 @@
popd
fi
---- a/ffmpeg/libavformat/utils.c
-+++ b/ffmpeg/libavformat/utils.c
-@@ -3432,7 +3432,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
- break;
- }
- if (st->parser && st->parser->parser->split &&
-- !st->codecpar->extradata)
-+ !st->internal->avctx->extradata)
- break;
- if (st->first_dts == AV_NOPTS_VALUE &&
- !(ic->iformat->flags & AVFMT_NOTIMESTAMPS) &&
--- a/ffmpeg/configure
+++ b/ffmpeg/configure
@@ -1217,7 +1217,7 @@ check_pkg_config(){
--
GitLab