From 8bbf6f5e0b902b33d67a79a707bec814391babd0 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Mon, 11 Sep 2023 14:58:31 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98=20ijk?=
 =?UTF-8?q?.media.player.BuildConfig=20is=20defined=20multiple=20times?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library-ijkplayer/src/main/AndroidManifest.xml                  | 2 +-
 .../src/main/java/tv/danmaku/ijk/media/Settings.java            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library-ijkplayer/src/main/AndroidManifest.xml b/library-ijkplayer/src/main/AndroidManifest.xml
index e45a047..e65c1f5 100644
--- a/library-ijkplayer/src/main/AndroidManifest.xml
+++ b/library-ijkplayer/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="tv.danmaku.ijk.media.player" >
+    package="tv.danmaku.ijk.media" >
 
 </manifest>
\ No newline at end of file
diff --git a/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/Settings.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/Settings.java
index cad08f2..ef54ffb 100644
--- a/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/Settings.java
+++ b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/Settings.java
@@ -20,7 +20,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
-import tv.danmaku.ijk.media.player.R;
+import tv.danmaku.ijk.media.R;
 
 public class Settings {
     private Context mAppContext;