aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2010-12-02 09:56:15 +0000
committerAnton Khirnov <wyskas@gmail.com>2010-12-02 09:56:15 +0000
commit3694ac240bc374528e7e83768d6cfd22882a6a11 (patch)
tree2afa4ff8bbf1382211bc12452fd3a7ee2a3a925b
parent1761272ba9f03d3c99dea8400adf79629bf2b9b5 (diff)
downloadffmpeg-3694ac240bc374528e7e83768d6cfd22882a6a11.tar.gz
mpc: read id3v1 tags.
Originally committed as revision 25860 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mpc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mpc.c b/libavformat/mpc.c
index 084f79752e..ecc980980a 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);
}