From 5ca83635d670aff1070f616a50d3fc43cccf2e29 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 25 十二月 2019 08:47:51 +0800
Subject: [PATCH] a

---
 .gitignore                                         |   36 ++++++++++--------------------------
 app/src/main/cpp/csrc/thirdparty/ffmpeg/bin/ffmpeg |    0 
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3a36c6e..5edb4ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,10 @@
-# Built application files
-*.apk
-*.ap_
-
-# Files for the Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-#Log Files
-*.log
+*.iml
+.gradle
+/local.properties
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
diff --git a/app/src/main/cpp/csrc/thirdparty/ffmpeg/bin/ffmpeg b/app/src/main/cpp/csrc/thirdparty/ffmpeg/bin/ffmpeg
new file mode 100644
index 0000000..10ebd3b
--- /dev/null
+++ b/app/src/main/cpp/csrc/thirdparty/ffmpeg/bin/ffmpeg
Binary files differ

--
Gitblit v1.8.0