Merge branch 'master' into devel

6 files changed, 12 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 7cd61179..1035d044 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@ version 0.4.1
 	fixed replaygain field parsing when reading cuesheets and r.g. peak scale handling (David Bryant)
 	added support for WavPack correction files (David Bryant)
 	fixed loading of album art embedded in ID3v2
+	added MP4 file type to ffmpeg plugin
 
 version 0.4.0
 	multiple tabbed playlists
diff --git a/PKGBUILD b/PKGBUILD
index c2db6f4c..5a42650b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Yakovenko <waker@users.sourceforge.net>
 
 pkgname=deadbeef
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="mp3/ogg/flac/ape/sid/mod/nsf/m4a/mpc/shn music player based on GTK2"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('gtk2' 'libsamplerate' 'alsa-lib')
 optdepends=('libvorbis: ogg vorbis playback', 'libmad: mp1/2/3 playback', 'flac: flac playback', 'curl: lastfm scrobbler, shoutcast, icecast, podcast support', 'wavpack: wv playback', 'libsndfile: wav playback', "libcdio and libcddb: audio cd playback", "ffmpeg: for aac, mpc, shn, aa3, oma, ac3, etc")
 makedepends=('pkgconfig')
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('4a8afe84288e2ca99f5b3dd584d11553')
+md5sums=('69383c6490461751c2ec6281158a8624')
 
 build() {
     cd $srcdir/$pkgname-$pkgver
diff --git a/about.txt b/about.txt
index 59050947..77a575c0 100644
--- a/about.txt
+++ b/about.txt
@@ -35,14 +35,17 @@ Contributors:
         Global Hotkeys plugin, CD Audio plugin, Cover Art plugin, lots of patches and suggestions
     
     Alex Dedul <rotmer@gmail.com>
+    David Bryant <david@wavpack.com>
     Derreck <sarumyanxxl@users.sourceforge.net>
     Igor Murzov <igor@gplsoft.org>
     Igor Rudchenko <igor@thinkpads.net>
     Kryksyh <druid@foobar2000.ru>
     Serghey Kotlyarov <shadowsbrother@gmail.com>
+    Themaister <maister@archlinux.us>
     Veniamin Gvozdikov <g.veniamin@googlemail.com>
 
 
+
 Special Thanks To:
 
     James Lee
diff --git a/plugins.c b/plugins.c
index 505e288e..b0517fab 100644
--- a/plugins.c
+++ b/plugins.c
@@ -43,8 +43,8 @@
 #include "junklib.h"
 #include "vfs.h"
 
-#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-//#define trace(fmt,...)
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
 
 #ifndef PATH_MAX
 #define PATH_MAX    1024    /* max # of characters in a path name */
diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
index 2a9ac0bc..fd220fbf 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", "mpc", "mp+", "mpp", "wma", "shn", "aa3", "oma", "ac3", "vqf", "tta", NULL };
+static const char * exts[] = { "m4a", "mp4", "mpc", "mp+", "mpp", "wma", "shn", "aa3", "oma", "ac3", "vqf", "tta", NULL };
 
 enum {
     FT_AAC = 0,
@@ -520,6 +520,9 @@ ffmpeg_insert (DB_playItem_t *after, const char *fname) {
     if (!strcasecmp (ext, "m4a")) {
         filetype = filetypes[FT_M4A];
     }
+    else if (!strcasecmp (ext, "mp4")) {
+        filetype = filetypes[FT_M4A];
+    }
     else if (!strcasecmp (ext, "mpc") || !strcasecmp (ext, "mp+") || !strcasecmp (ext, "mpp")) {
         filetype = filetypes[FT_MUSEPACK];
     }
diff --git a/plugins/gtkui/ddblistview.c b/plugins/gtkui/ddblistview.c
index 7156f147..cfb82cbf 100644
--- a/plugins/gtkui/ddblistview.c
+++ b/plugins/gtkui/ddblistview.c
@@ -36,8 +36,6 @@
 #include "drawing.h"
 #include "gtkui.h"
 
-#pragma GCC optimize("O0")
-
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))