bumped ffmpeg to 1.2: added support for AMR format

8 files changed, 10 insertions, 3 deletions

diff --git a/lib-x86-32/libavcodec.a b/lib-x86-32/libavcodec.a
index 4e670cbc..6e429f4a 100644
--- a/lib-x86-32/libavcodec.a
+++ b/lib-x86-32/libavcodec.a
diff --git a/lib-x86-32/libavcore.a b/lib-x86-32/libavcore.a
index 475ffffb..650b57ed 100644
--- a/lib-x86-32/libavcore.a
+++ b/lib-x86-32/libavcore.a
diff --git a/lib-x86-32/libavformat.a b/lib-x86-32/libavformat.a
index 58dd2ab9..a7adafee 100644
--- a/lib-x86-32/libavformat.a
+++ b/lib-x86-32/libavformat.a
diff --git a/lib-x86-32/libavutil.a b/lib-x86-32/libavutil.a
index c565f3d1..e53d807c 100644
--- a/lib-x86-32/libavutil.a
+++ b/lib-x86-32/libavutil.a
diff --git a/lib-x86-32/libopencore-amrnb.a b/lib-x86-32/libopencore-amrnb.a
new file mode 100644
index 00000000..7ce4236c
--- /dev/null
+++ b/lib-x86-32/libopencore-amrnb.a
diff --git a/lib-x86-32/libopencore-amrwb.a b/lib-x86-32/libopencore-amrwb.a
new file mode 100644
index 00000000..64cef81b
--- /dev/null
+++ b/lib-x86-32/libopencore-amrwb.a
diff --git a/plugins/ffmpeg/ChangeLog b/plugins/ffmpeg/ChangeLog
index a3edb5f1..f3179866 100644
--- a/plugins/ffmpeg/ChangeLog
+++ b/plugins/ffmpeg/ChangeLog
@@ -1,2 +1,5 @@
+version 1.2
+	Added AMR support via libopencore
+
 version 1.1
     Switched to ffmpeg commit 25472
diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
index 498f0332..89917c83 100644
--- a/plugins/ffmpeg/ffmpeg.c
+++ b/plugins/ffmpeg/ffmpeg.c
@@ -55,7 +55,7 @@
 static DB_decoder_t plugin;
 static DB_functions_t *deadbeef;
 
-static const char * exts[] = { "m4a", "wma", "aa3", "oma", "ac3", "vqf", NULL };
+static const char * exts[] = { "m4a", "wma", "aa3", "oma", "ac3", "vqf", "amr", NULL };
 
 enum {
     FT_ALAC = 0,
@@ -63,10 +63,11 @@ enum {
     FT_ATRAC3 = 2,
     FT_VQF = 3,
     FT_AC3 = 4,
+    FT_AMR = 5,
     FT_UNKNOWN = 5
 };
 
-static const char *filetypes[] = { "ALAC", "WMA", "ATRAC3", "VQF", "AC3", "FFMPEG (unknown)", NULL };
+static const char *filetypes[] = { "ALAC", "WMA", "ATRAC3", "VQF", "AC3", "AMR", "FFMPEG (unknown)", NULL };
 
 #define FF_PROTOCOL_NAME "deadbeef"
 
@@ -169,6 +170,9 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
     else if (strcasestr (info->codec->name, "ac3")) {
         it->filetype = filetypes[FT_AC3];
     }
+    else if (strcasestr (info->codec->name, "amr")) {
+        it->filetype = filetypes[FT_AMR];
+    }
     else {
         it->filetype = filetypes[FT_UNKNOWN];
     }
@@ -715,7 +719,7 @@ ffmpeg_read_metadata (DB_playItem_t *it) {
 static DB_decoder_t plugin = {
     DB_PLUGIN_SET_API_VERSION
     .plugin.version_major = 1,
-    .plugin.version_minor = 1,
+    .plugin.version_minor = 2,
     .plugin.type = DB_PLUGIN_DECODER,
     .plugin.id = "ffmpeg",
     .plugin.name = "FFMPEG audio player",