Merge branch 'master' into devel

Conflicts:
	configure.ac
	streamer.c
	streamer.h

1 files changed, 12 insertions, 7 deletions

diff --git a/junklib.c b/junklib.c
index c264e51d..5ebfbf1d 100644
--- a/junklib.c
+++ b/junklib.c
@@ -1,6 +1,9 @@
-/* junklib -- library for reading tags from various audio files for deadbeef player
+/*
+  This file is part of Deadbeef Player source code
   http://deadbeef.sourceforge.net
 
+  library for reading tags from various audio files
+
   Copyright (C) 2009-2012 Alexey Yakovenko
 
   This software is provided 'as-is', without any express or implied
@@ -1360,13 +1363,15 @@ junk_apev2_read_full (playItem_t *it, DB_apev2_tag_t *tag_store, DB_FILE *fp) {
             }
             value[itemsize] = 0;
 
-            // replace 0s with \n
-            uint8_t *p = value;
-            while (p < value + itemsize - 1) {
-                if (*p == 0) {
-                    *p = '\n';
+            if ((flags&6) == 0 && strncasecmp (key, "cover art ", 10)) {
+                // replace 0s with \n
+                uint8_t *p = value;
+                while (p < value + itemsize - 1) {
+                    if (*p == 0) {
+                        *p = '\n';
+                    }
+                    p++;
                 }
-                p++;
             }
 
             junk_apev2_add_frame (it, tag_store, &tail, itemsize, itemflags, key, value);