Skip to content
Snippets Groups Projects
Unverified Commit 2cf1c160 authored by Jeremy Soller's avatar Jeremy Soller Committed by GitHub
Browse files

Merge pull request #130 from xTibor/ffmpeg-3.4

Update ffmpeg to 3.4
parents f369f548 05b179e7
No related branches found
No related tags found
No related merge requests found
diff --git a/configure b/configure diff -rupN source-original/configure source/configure
index 7201941..e3b2875 100755 --- source-original/configure 2018-03-04 11:13:59.000000000 +0100
--- a/configure +++ source/configure 2018-03-04 11:18:10.026033282 +0100
+++ b/configure @@ -5141,6 +5141,8 @@ case $target_os in
@@ -5055,6 +5055,8 @@ case $target_os in
;; ;;
minix) minix)
;; ;;
...@@ -11,10 +10,9 @@ index 7201941..e3b2875 100755 ...@@ -11,10 +10,9 @@ index 7201941..e3b2875 100755
none) none)
;; ;;
*) *)
diff --git a/ffmpeg.c b/ffmpeg.c diff -rupN source-original/fftools/ffmpeg.c source/fftools/ffmpeg.c
index 888d19a..aeeb0e5 100644 --- source-original/fftools/ffmpeg.c 2018-03-04 11:13:59.000000000 +0100
--- a/ffmpeg.c +++ source/fftools/ffmpeg.c 2018-03-04 11:45:38.326394016 +0100
+++ b/ffmpeg.c
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
#if HAVE_TERMIOS_H #if HAVE_TERMIOS_H
......
VERSION=3.3 VERSION=3.4
GIT=https://github.com/FFmpeg/FFmpeg GIT=https://github.com/FFmpeg/FFmpeg
BRANCH=release/$VERSION BRANCH=release/$VERSION
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment