提交 55b19246 编写于 作者: Y yangdan07

refactor(las): modify the ffmpeg version

上级 55f18d0d
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
#include "ijkmeta.h" #include "ijkmeta.h"
#include "ijkversion.h" #include "ijkversion.h"
#include "ijkplayer.h" #include "ijkplayer.h"
#include "ijklas.h"
#include <stdatomic.h> #include <stdatomic.h>
#if defined(__ANDROID__) #if defined(__ANDROID__)
#include "ijksoundtouch/ijksoundtouch_wrap.h" #include "ijksoundtouch/ijksoundtouch_wrap.h"
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
# #
# IJK_FFMPEG_UPSTREAM=git://git.videolan.org/ffmpeg.git # IJK_FFMPEG_UPSTREAM=git://git.videolan.org/ffmpeg.git
IJK_FFMPEG_UPSTREAM=https://github.com/bupt-steven/FFmpeg.git IJK_FFMPEG_UPSTREAM=https://github.com/Bilibili/FFmpeg.git
IJK_FFMPEG_FORK=https://github.com/bupt-steven/FFmpeg.git IJK_FFMPEG_FORK=https://github.com/Bilibili/FFmpeg.git
IJK_FFMPEG_COMMIT=ff3.4--ijk0.8.8--20200820--001 IJK_FFMPEG_COMMIT=ea1df44
IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg
set -e set -e
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
# #
# IJK_FFMPEG_UPSTREAM=git://git.videolan.org/ffmpeg.git # IJK_FFMPEG_UPSTREAM=git://git.videolan.org/ffmpeg.git
IJK_FFMPEG_UPSTREAM=https://github.com/bupt-steven/FFmpeg.git IJK_FFMPEG_UPSTREAM=https://github.com/Bilibili/FFmpeg.git
IJK_FFMPEG_FORK=https://github.com/bupt-steven/FFmpeg.git IJK_FFMPEG_FORK=https://github.com/Bilibili/FFmpeg.git
IJK_FFMPEG_COMMIT=ff3.4--ijk0.8.8--20200820--001 IJK_FFMPEG_COMMIT=ea1df44
IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg
IJK_GASP_UPSTREAM=https://github.com/Bilibili/gas-preprocessor.git IJK_GASP_UPSTREAM=https://github.com/Bilibili/gas-preprocessor.git
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#import "ijkioapplication.h" #import "ijkioapplication.h"
#include "string.h" #include "string.h"
static const char *kIJKFFRequiredFFmpegVersion = "ff3.4--ijk0.8.8--20200820--001"; static const char *kIJKFFRequiredFFmpegVersion = "ea1df44";
// It means you didn't call shutdown if you found this object leaked. // It means you didn't call shutdown if you found this object leaked.
@interface IJKWeakHolder : NSObject @interface IJKWeakHolder : NSObject
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册