MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-29 16:18:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #130 from xTibor/ffmpeg-3.4

Browse Source 
Update ffmpeg to 3.4
This commit is contained in:
Jeremy Soller 2018-03-04 06:17:58 -07:00 committed by GitHub
commit 2cf1c16021
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
recipes/ffmpeg/ffmpeg.patch
View File

@ -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

2
recipes/ffmpeg/recipe.sh
View File

@ -1,4 +1,4 @@
VERSION=3.3
VERSION=3.4
GIT=https://github.com/FFmpeg/FFmpeg
BRANCH=release/$VERSION