merged with devel

1 files changed, 17 insertions, 17 deletions

diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
index 62c60bf8..eb99ff9b 100644
--- a/plugins/ffmpeg/ffmpeg.c
+++ b/plugins/ffmpeg/ffmpeg.c
@@ -55,20 +55,20 @@
 static DB_decoder_t plugin;
 static DB_functions_t *deadbeef;
 
-static const char * exts[] = { "m4a", "aac", "mp4", "mp+", "mpp", "wma", "shn", "aa3", "oma", "ac3", "vqf", NULL };
+static const char * exts[] = { "m4a", "mp+", "mpp", "wma", "shn", "aa3", "oma", "ac3", "vqf", NULL };
 
 enum {
-    FT_AAC = 0,
-    FT_M4A = 1,
-    FT_WMA = 2,
-    FT_SHORTEN = 3,
-    FT_ATRAC3 = 4,
-    FT_VQF = 5,
-    FT_TTA = 6,
-    FT_UNKNOWN = 7
+//    FT_AAC = 0,
+    FT_M4A = 0,
+    FT_WMA = 1,
+    FT_SHORTEN = 2,
+    FT_ATRAC3 = 3,
+    FT_VQF = 4,
+    FT_TTA = 5,
+    FT_UNKNOWN = 6
 };
 
-static const char *filetypes[] = { "AAC", "M4A", "WMA", "Shorten", "atrac3", "VQF", "TTA", "FFMPEG", NULL };
+static const char *filetypes[] = { "M4A", "WMA", "Shorten", "atrac3", "VQF", "TTA", "FFMPEG (unknown)", NULL };
 
 #define FF_PROTOCOL_NAME "deadbeef"
 
@@ -519,12 +519,12 @@ ffmpeg_insert (DB_playItem_t *after, const char *fname) {
     if (!strcasecmp (ext, "m4a")) {
         filetype = filetypes[FT_M4A];
     }
-    if (!strcasecmp (ext, "aac")) {
-        filetype = filetypes[FT_AAC];
-    }
-    else if (!strcasecmp (ext, "mp4")) {
-        filetype = filetypes[FT_M4A];
-    }
+//    if (!strcasecmp (ext, "aac")) {
+//        filetype = filetypes[FT_AAC];
+//    }
+//    else if (!strcasecmp (ext, "mp4")) {
+//        filetype = filetypes[FT_M4A];
+//    }
     else if (!strcasecmp (ext, "wma")) {
         filetype = filetypes[FT_WMA];
     }
@@ -609,7 +609,7 @@ ffmpeg_vfs_read(URLContext *h, unsigned char *buf, int size)
 }
 
 static int
-ffmpeg_vfs_write(URLContext *h, unsigned char *buf, int size)
+ffmpeg_vfs_write(URLContext *h, const unsigned char *buf, int size)
 {
     return -1;
 }