ffmpeg: upgrade

bbcallen · bbcallen · commit 9b013cbdbf1d · 2016-04-25T17:45:51.000+08:00
diff --git 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.0--ijk0.4.5.1--dev0.4.5--rc10
+IJK_FFMPEG_COMMIT=ff3.0--ijk0.5.0--dev0.4.5--rc11
 IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg
 
 set -e
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=ff3.0--ijk0.4.5.1--dev0.4.5--rc10
+IJK_FFMPEG_COMMIT=ff3.0--ijk0.5.0--dev0.4.5--rc11
 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
@@ -34,7 +34,7 @@
 #include "ijkplayer/version.h"
 #include "ijkplayer/ijkavformat/ijkavformat.h"
 
-static const char *kIJKFFRequiredFFmpegVersion = "ff3.0--ijk0.4.5.1--dev0.4.5--rc10";
+static const char *kIJKFFRequiredFFmpegVersion = "ff3.0--ijk0.5.0--dev0.4.5--rc11";
 
 @interface IJKFFMoviePlayerController()
 
