Skip to content

Commit

Permalink
ffmpeg: add a dummy tag for a different configure
Browse files Browse the repository at this point in the history
  • Loading branch information
xinzhengzhang committed Nov 17, 2016
1 parent 31a084d commit 589f455
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion init-android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion init-ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 589f455

Please sign in to comment.