From 589f45513de76426e97cf252defbf75901f18a0a Mon Sep 17 00:00:00 2001 From: Xinzheng Zhang Date: Thu, 17 Nov 2016 11:58:41 +0800 Subject: [PATCH] ffmpeg: add a dummy tag for a different configure --- init-android.sh | 2 +- init-ios.sh | 2 +- ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/init-android.sh b/init-android.sh index 38e2ba33..95664436 100755 --- a/init-android.sh +++ b/init-android.sh @@ -18,7 +18,7 @@ # IJK_FFMPEG_UPSTREAM=git://git.videolan.org/ffmpeg.git IJK_FFMPEG_UPSTREAM=https://github.com/Bilibili/FFmpeg.git IJK_FFMPEG_FORK=https://github.com/Bilibili/FFmpeg.git -IJK_FFMPEG_COMMIT=ff3.2--ijk0.7.2-20161107--001 +IJK_FFMPEG_COMMIT=ff3.2--ijk0.7.4--20161116--001 IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg set -e diff --git a/init-ios.sh b/init-ios.sh index ad1e8009..0bf96a51 100755 --- a/init-ios.sh +++ b/init-ios.sh @@ -18,7 +18,7 @@ # IJK_FFMPEG_UPSTREAM=git://git.videolan.org/ffmpeg.git IJK_FFMPEG_UPSTREAM=https://github.com/Bilibili/FFmpeg.git IJK_FFMPEG_FORK=https://github.com/Bilibili/FFmpeg.git -IJK_FFMPEG_COMMIT=ff3.2--ijk0.7.2-20161107--001 +IJK_FFMPEG_COMMIT=ff3.2--ijk0.7.4--20161116--001 IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg IJK_GASP_UPSTREAM=https://github.com/Bilibili/gas-preprocessor.git diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m index e21ee062..6116d9a4 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m @@ -32,7 +32,7 @@ #include "string.h" -static const char *kIJKFFRequiredFFmpegVersion = "ff3.2--ijk0.7.2-20161107--001"; +static const char *kIJKFFRequiredFFmpegVersion = "ff3.2--ijk0.7.4--20161116--001"; // It means you didn't call shutdown if you found this object leaked. @interface IJKWeakHolder : NSObject -- GitLab