Commit 7cf4a2b

author

chenyouwei

committed

fix:android basis先去除ffmpeg

1 parent 0dddc6c commit 7cf4a2bCopy full SHA for 7cf4a2b

File tree

-62

lines changed

-62

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ public void onClick(View v) {`
`531`	`531`	`goCCMainActivity();`
`532`	`532`	`}`
`533`	`533`	`});`
`534`		`- goCCMainActivity();`
	`534`	`+// goCCMainActivity();`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`private void goCCMainActivity(){`

Lines changed: 0 additions & 36 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,39 +45,3 @@ target_link_libraries( # Specifies the target library.`
`45`	`45`	`# included in the NDK.`
`46`	`46`	`${log-lib} )`
`47`	`47`
`48`		`-# -------- 以下ffm`
`49`		`-#找到包含所有的cpp文件`
`50`		`-file(GLOB allCpp *.cpp)`
`51`		`-`
`52`		`-#打印当前 cmakeLists 的路径`
`53`		`-message("当前cmakel路径: ${CMAKE_SOURCE_DIR} \n cpu架构:${CMAKE_ANDROID_ARCH_ABI}")`
`54`		`-`
`55`		`-add_library(`
`56`		`- ffmpeg_lib`
`57`		`-`
`58`		`- SHARED`
`59`		`-`
`60`		`- ffmpeg-lib.cpp)`
`61`		`-`
`62`		`-find_library(`
`63`		`- log-lib`
`64`		`-`
`65`		`- log)`
`66`		`-`
`67`		`-# 引入FFmpeg的头文件`
`68`		`-include_directories(${CMAKE_SOURCE_DIR}/include)`
`69`		`-`
`70`		`-# 引入FFmpeg的库文件,设置内部的方式引入,指定库的目录是 -L 指定具体的库-l`
`71`		`-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L${CMAKE_SOURCE_DIR}/${CMAKE_ANDROID_ARCH_ABI}")`
`72`		`-`
`73`		`-target_link_libraries(`
`74`		`- ffmpeg_lib`
`75`		`-`
`76`		`- # 具体的库文件,链接到总库`
`77`		`- # 这样写会报错,有坑`
`78`		`- # avcodec avfilter avformat avutil swresample swscale`
`79`		`-`
`80`		`- # 先把有依赖的库,先依赖进来`
`81`		`- avformat avcodec avfilter avutil swresample swscale`
`82`		`-`
`83`		`- ${log-lib})`

Lines changed: 0 additions & 22 deletions

This file was deleted.

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class CCMainActivity extends AppCompatActivity {`
`26`	`26`	`// Used to load the 'native-lib' library on application startup.`
`27`	`27`	`static {`
`28`	`28`	`System.loadLibrary("native-lib");`
`29`		`- System.loadLibrary("ffmpeg_lib");`
	`29`	`+// System.loadLibrary("ffmpeg_lib");`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
`@@ -62,7 +62,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {`
`62`	`62`	`NostaticRef();`
`63`	`63`	`}`
`64`	`64`
`65`		`- Log.e("aaa","getFFmpegVersion"+getFFmpegVersion());`
	`65`	`+// Log.e("aaa","getFFmpegVersion"+getFFmpegVersion());`
`66`	`66`
`67`	`67`
`68`	`68`
`@@ -73,7 +73,7 @@ public int getIntValue(){`
`73`	`73`	`return 1;`
`74`	`74`	`}`
`75`	`75`
`76`		`- public native String getFFmpegVersion();`
	`76`	`+// public native String getFFmpegVersion();`
`77`	`77`
`78`	`78`	`public native String stringFromJNI();`
`79`	`79`	`//返回静态字符串`

Comments

(0)