Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
58a7eebe
I
ijkplayer
项目概览
qq_25606643
/
ijkplayer
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
ijkplayer
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
58a7eebe
编写于
11月 08, 2016
作者:
X
Xinzheng Zhang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
k0.7.3
上级
849b552d
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
33 addition
and
27 deletion
+33
-27
NEWS.md
NEWS.md
+6
-0
README.md
README.md
+9
-9
android/ijkplayer/build.gradle
android/ijkplayer/build.gradle
+2
-2
android/ijkplayer/gradle.properties
android/ijkplayer/gradle.properties
+2
-2
android/ijkplayer/ijkplayer-example/build.gradle
android/ijkplayer/ijkplayer-example/build.gradle
+10
-10
android/ijkplayer/ijkplayer-exo/build.gradle
android/ijkplayer/ijkplayer-exo/build.gradle
+1
-1
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m
...JKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m
+1
-1
version.sh
version.sh
+2
-2
未找到文件。
NEWS.md
浏览文件 @
58a7eebe
tag next
--------------------------------
tag k0.7.3
-
ios: turn videotoolbox into singleton
-
ffmoeg: merge ipv6 issue in tcp.c
tag k0.7.2
-------------------------------
-
ios: fix a compile error
tag k0.7.1
...
...
README.md
浏览文件 @
58a7eebe
...
...
@@ -21,17 +21,17 @@ allprojects {
dependencies {
# required, enough for most devices.
compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.
2
'
compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.
2
'
compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.
3
'
compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.
3
'
# Other ABIs: optional
compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.
2
'
compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.
2
'
compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.
2
'
compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.
2
'
compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.
3
'
compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.
3
'
compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.
3
'
compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.
3
'
# ExoPlayer as IMediaPlayer: optional, experimental
compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.
2
'
compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.
3
'
}
```
-
iOS
...
...
@@ -137,7 +137,7 @@ sudo dpkg-reconfigure dash
```
git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-android
cd ijkplayer-android
git checkout -B latest k0.7.
2
git checkout -B latest k0.7.
3
./init-android.sh
...
...
@@ -191,7 +191,7 @@ cd ..
```
git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-ios
cd ijkplayer-ios
git checkout -B latest k0.7.
2
git checkout -B latest k0.7.
3
./init-ios.sh
...
...
android/ijkplayer/build.gradle
浏览文件 @
58a7eebe
...
...
@@ -26,8 +26,8 @@ ext {
targetSdkVersion
=
23
versionCode
=
700
1
00
versionName
=
"0.7.
2
"
versionCode
=
700
3
00
versionName
=
"0.7.
3
"
}
wrapper
{
...
...
android/ijkplayer/gradle.properties
浏览文件 @
58a7eebe
...
...
@@ -17,8 +17,8 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
VERSION_NAME
=
0.7.
2
VERSION_CODE
=
700
1
00
VERSION_NAME
=
0.7.
3
VERSION_CODE
=
700
3
00
GROUP
=
tv.danmaku.ijk.media
# http://central.sonatype.org/pages/requirements.html
...
...
android/ijkplayer/ijkplayer-example/build.gradle
浏览文件 @
58a7eebe
...
...
@@ -54,18 +54,18 @@ dependencies {
all64Compile
project
(
':ijkplayer-x86'
)
all64Compile
project
(
':ijkplayer-x86_64'
)
// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.
2
'
// compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.
2
'
// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.
3
'
// compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.
3
'
// all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.
2
'
// all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.
2
'
// all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.
2
'
// all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.
3
'
// all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.
3
'
// all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.
3
'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.
2
'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.
2
'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.
2
'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.
2
'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.
2
'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.
3
'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.
3
'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.
3
'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.
3
'
// all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.
3
'
// armv5Compile project(':player-armv5')
// armv7aCompile project(':player-armv7a')
...
...
android/ijkplayer/ijkplayer-exo/build.gradle
浏览文件 @
58a7eebe
...
...
@@ -28,7 +28,7 @@ dependencies {
compile
'com.google.android.exoplayer:exoplayer:r1.5.11'
compile
project
(
':ijkplayer-java'
)
// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.
2
'
// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.
3
'
}
gradle
.
startParameter
.
taskNames
.
each
{
task
->
...
...
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m
浏览文件 @
58a7eebe
...
...
@@ -32,7 +32,7 @@
#include "string.h"
static
const
char
*
kIJKFFRequiredFFmpegVersion
=
"ff3.2--ijk0.7.
0--20161102
--001"
;
static
const
char
*
kIJKFFRequiredFFmpegVersion
=
"ff3.2--ijk0.7.
2-20161107
--001"
;
// It means you didn't call shutdown if you found this object leaked.
@interface
IJKWeakHolder
:
NSObject
...
...
version.sh
浏览文件 @
58a7eebe
...
...
@@ -2,8 +2,8 @@
set
-e
VERSION_CODE
=
700
1
00
VERSION_NAME
=
0.7.
2
VERSION_CODE
=
700
3
00
VERSION_NAME
=
0.7.
3
VERSION_TARGET
=
$1
do_version_readme
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录