[SCM] libav/experimental: mpc: read id3v1 tags.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3694ac240bc374528e7e83768d6cfd22882a6a11
Author: Anton Khirnov <wyskas at gmail.com>
Date:   Thu Dec 2 09:56:15 2010 +0000

    mpc: read id3v1 tags.
    
    Originally committed as revision 25860 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mpc.c b/libavformat/mpc.c
index 084f797..ecc9809 100644
--- a/libavformat/mpc.c
+++ b/libavformat/mpc.c
@@ -22,6 +22,7 @@
 #include "libavcodec/get_bits.h"
 #include "avformat.h"
 #include "apetag.h"
+#include "id3v1.h"
 
 #define MPC_FRAMESIZE  1152
 #define DELAY_FRAMES   32
@@ -95,6 +96,8 @@ static int mpc_read_header(AVFormatContext *s, AVFormatParameters *ap)
     if (!url_is_streamed(s->pb)) {
         int64_t pos = url_ftell(s->pb);
         ff_ape_parse_tag(s);
+        if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX))
+            ff_id3v1_read(s);
         url_fseek(s->pb, pos, SEEK_SET);
     }
 

-- 
Libav/FFmpeg packaging