Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
NotesChapter
ijkplayer
提交
6aebfeae
I
ijkplayer
项目概览
NotesChapter
/
ijkplayer
与 Fork 源项目一致
从无法访问的项目Fork
通知
5
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,发现更多精彩内容 >>
提交
6aebfeae
编写于
6月 06, 2013
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
jni: minisdl: individal module
上级
5e569659
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
27 addition
and
2 deletion
+27
-2
ijkmediaplayer/jni/ijkplayer/Android.mk
ijkmediaplayer/jni/ijkplayer/Android.mk
+1
-1
ijkmediaplayer/jni/ijkplayer/ijkplayer_jni.c
ijkmediaplayer/jni/ijkplayer/ijkplayer_jni.c
+1
-1
ijkmediaplayer/jni/minisdl/Android.mk
ijkmediaplayer/jni/minisdl/Android.mk
+25
-0
ijkmediaplayer/jni/minisdl/minisdl_thread.c
ijkmediaplayer/jni/minisdl/minisdl_thread.c
+0
-0
ijkmediaplayer/jni/minisdl/minisdl_thread.h
ijkmediaplayer/jni/minisdl/minisdl_thread.h
+0
-0
未找到文件。
ijkmediaplayer/jni/ijkplayer/Android.mk
浏览文件 @
6aebfeae
...
...
@@ -30,8 +30,8 @@ LOCAL_LDLIBS += -llog
LOCAL_SRC_FILES
:=
ijkplayer_jni.c
LOCAL_SRC_FILES
+=
ijkplayer.c
LOCAL_SRC_FILES
+=
pkt_queue.c
LOCAL_SRC_FILES
+=
minisdl/minisdl_thread.c
LOCAL_STATIC_LIBRARIES
:=
minisdl
LOCAL_SHARED_LIBRARIES
:=
ffmpeg helpers
LOCAL_MODULE
:=
ijkplayer
...
...
ijkmediaplayer/jni/ijkplayer/ijkplayer_jni.c
浏览文件 @
6aebfeae
...
...
@@ -49,7 +49,7 @@ static IjkMediaPlayer *get_media_player(JNIEnv* env, jobject thiz)
// FIXME: lock ref count
pthread_mutex_lock
(
&
g_clazz
.
mutex
);
IjkMediaPlayer
*
mp
=
(
IjkMediaPlayer
*
)
(
*
env
)
->
GetLongField
(
env
,
thiz
,
g_clazz
.
mNativeMediaPlayer
);
IjkMediaPlayer
*
mp
=
(
IjkMediaPlayer
*
)
(
intptr_t
)
(
*
env
)
->
GetLongField
(
env
,
thiz
,
g_clazz
.
mNativeMediaPlayer
);
if
(
mp
)
{
ijkmp_inc_ref
(
mp
);
}
...
...
ijkmediaplayer/jni/minisdl/Android.mk
0 → 100644
浏览文件 @
6aebfeae
# copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
#
# This file is part of ijkPlayer.
#
# ijkPlayer is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# ijkPlayer is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with ijkPlayer; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
LOCAL_PATH
:=
$(
call
my-dir
)
include
$(CLEAR_VARS)
LOCAL_C_CFLAGS
:=
-std
=
c99
LOCAL_SRC_FILES
:=
minisdl_thread.c
LOCAL_MODULE
:=
minisdl
include
$(BUILD_STATIC_LIBRARY)
ijkmediaplayer/jni/
ijkplayer/
minisdl/minisdl_thread.c
→
ijkmediaplayer/jni/minisdl/minisdl_thread.c
浏览文件 @
6aebfeae
文件已移动
ijkmediaplayer/jni/
ijkplayer/
minisdl/minisdl_thread.h
→
ijkmediaplayer/jni/minisdl/minisdl_thread.h
浏览文件 @
6aebfeae
文件已移动
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录