From 05b179e7f9699ef85359edcc0df66faeb0a5c59c Mon Sep 17 00:00:00 2001 From: Tibor Nagy <xnagytibor@gmail.com> Date: Sun, 4 Mar 2018 12:22:55 +0100 Subject: [PATCH] Update ffmpeg to 3.4 --- recipes/ffmpeg/ffmpeg.patch | 16 +++++++--------- recipes/ffmpeg/recipe.sh | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/recipes/ffmpeg/ffmpeg.patch b/recipes/ffmpeg/ffmpeg.patch index 9719e12c7..9d24920c0 100644 --- a/recipes/ffmpeg/ffmpeg.patch +++ b/recipes/ffmpeg/ffmpeg.patch @@ -1,8 +1,7 @@ -diff --git a/configure b/configure -index 7201941..e3b2875 100755 ---- a/configure -+++ b/configure -@@ -5055,6 +5055,8 @@ case $target_os in +diff -rupN source-original/configure source/configure +--- source-original/configure 2018-03-04 11:13:59.000000000 +0100 ++++ source/configure 2018-03-04 11:18:10.026033282 +0100 +@@ -5141,6 +5141,8 @@ case $target_os in ;; minix) ;; @@ -11,10 +10,9 @@ index 7201941..e3b2875 100755 none) ;; *) -diff --git a/ffmpeg.c b/ffmpeg.c -index 888d19a..aeeb0e5 100644 ---- a/ffmpeg.c -+++ b/ffmpeg.c +diff -rupN source-original/fftools/ffmpeg.c source/fftools/ffmpeg.c +--- source-original/fftools/ffmpeg.c 2018-03-04 11:13:59.000000000 +0100 ++++ source/fftools/ffmpeg.c 2018-03-04 11:45:38.326394016 +0100 @@ -91,7 +91,7 @@ #if HAVE_TERMIOS_H diff --git a/recipes/ffmpeg/recipe.sh b/recipes/ffmpeg/recipe.sh index 7b74bc381..96757802f 100644 --- a/recipes/ffmpeg/recipe.sh +++ b/recipes/ffmpeg/recipe.sh @@ -1,4 +1,4 @@ -VERSION=3.3 +VERSION=3.4 GIT=https://github.com/FFmpeg/FFmpeg BRANCH=release/$VERSION -- GitLab