Skip to content
Snippets Groups Projects
Commit df6b9f06 authored by Andreas Traczyk's avatar Andreas Traczyk Committed by Andreas Traczyk
Browse files

contrib(UWP): bump ffmpeg to 3.3.2


Change-Id: Ia2adeffb087c0e2a7ddd0db1d1a3d93768814a22
Reviewed-by: default avatarGuillaume Roguez <guillaume.roguez@savoirfairelinux.com>
parent dc73af83
No related branches found
No related tags found
No related merge requests found
set BUILD=%SRC%..\build 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 set FFMPEGINTEROP_URL=https://github.com/Microsoft/FFmpegInterop/archive/%FFMPEGINTEROP_VERSION%.tar.gz
mkdir %BUILD% mkdir %BUILD%
...@@ -19,7 +19,7 @@ cd %BUILD%\FFmpegInterop ...@@ -19,7 +19,7 @@ cd %BUILD%\FFmpegInterop
rmdir /s /q ffmpeg 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 set FFMPEG_URL=https://github.com/FFmpeg/FFmpeg/archive/%FFMPEG_VERSION%.tar.gz
if %USE_CACHE%==1 ( if %USE_CACHE%==1 (
......
...@@ -92,17 +92,6 @@ ...@@ -92,17 +92,6 @@
popd popd
fi 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 --- a/ffmpeg/configure
+++ b/ffmpeg/configure +++ b/ffmpeg/configure
@@ -1217,7 +1217,7 @@ check_pkg_config(){ @@ -1217,7 +1217,7 @@ check_pkg_config(){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment