Merge pull request #4 from Bilibili/master

update to last version
toss156 · Jan 27, 2016 · 44ab949 · 44ab949
2 parents 8c7a319 + a923842
commit 44ab949
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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

diff --git 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()