diff options
author | Anton Khirnov <anton@khirnov.net> | 2014-02-20 00:02:12 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2014-03-24 09:13:39 +0400 |
commit | 15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7 (patch) | |
tree | 1062b31f2d61e72918369c6441cb8a737b2aa1f6 /libavformat | |
parent | 06c3cd3c0186803619bc6aad2d8f06c3e9015d15 (diff) |
mp3dec: export replaygain tags from ID3v2
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/Makefile | 2 | ||||
-rw-r--r-- | libavformat/mp3dec.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 5694314af2..7ab30aac0f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -182,7 +182,7 @@ OBJS-$(CONFIG_MOV_DEMUXER) += mov.o isom.o mov_chan.o OBJS-$(CONFIG_MOV_MUXER) += movenc.o isom.o avc.o hevc.o \ movenchint.o mov_chan.o OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o rawenc.o id3v2enc.o -OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o +OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o replaygain.o OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o apetag.o img2.o OBJS-$(CONFIG_MPC8_DEMUXER) += mpc8.o apetag.o img2.o diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 5c263edca9..414c7e9174 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -27,6 +27,8 @@ #include "internal.h" #include "id3v2.h" #include "id3v1.h" +#include "replaygain.h" + #include "libavcodec/mpegaudiodecheader.h" #define XING_FLAG_FRAMES 0x01 @@ -194,6 +196,7 @@ static int mp3_read_header(AVFormatContext *s) { AVStream *st; int64_t off; + int ret; st = avformat_new_stream(s, NULL); if (!st) @@ -215,6 +218,10 @@ static int mp3_read_header(AVFormatContext *s) if (mp3_parse_vbr_tags(s, st, off) < 0) avio_seek(s->pb, off, SEEK_SET); + ret = ff_replaygain_export(st, s->metadata); + if (ret < 0) + return ret; + /* the parameters will be extracted from the compressed bitstream */ return 0; } |