From 03e7784e8f01dabd8d524a795b38a93a15e207f3 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Wed, 27 Jan 2016 13:00:38 +0800 Subject: [PATCH 1/2] init-ios.sh: upgrade ffmpeg to ff2.8--ijk0.4.4.1--dev0.3.3--rc7 --- init-ios.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-ios.sh b/init-ios.sh index 47c629043f..5ed090d5ac 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=ff2.8--ijk0.4.4.1--dev0.3.3--rc6 +IJK_FFMPEG_COMMIT=ff2.8--ijk0.4.4.1--dev0.3.3--rc7 IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg IJK_GASP_UPSTREAM=https://github.com/Bilibili/gas-preprocessor.git From a923842ea83572a497a150afa2fa48937c9b8ec5 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Wed, 27 Jan 2016 16:01:24 +0800 Subject: [PATCH 2/2] ios: update ffmpeg hash --- ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m index 034bab8636..5aac613a12 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m @@ -33,7 +33,7 @@ #include "ijkplayer/version.h" #include "ijkplayer/ijkavformat/ijkavformat.h" -static const char *kIJKFFRequiredFFmpegVersion = "ff2.8--ijk0.4.4.1--dev0.3.3--rc6"; +static const char *kIJKFFRequiredFFmpegVersion = "ff2.8--ijk0.4.4.1--dev0.3.3--rc7"; @interface IJKFFMoviePlayerController()