diff options
| author | Paul Arzelier <paul.arzelier@free.fr> | 2017-01-28 17:25:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-01-28 23:08:42 +0100 |
| commit | 65862f57ad2f7f49d715f334a9d892e0b20d42f1 (patch) | |
| tree | bc7d703dd79cbf22da92d2492f412b2faa57fa2d /libavformat/mp3dec.c | |
| parent | dce863421b64d4d00c1384997b826ffe3c945620 (diff) | |
| download | ffmpeg-65862f57ad2f7f49d715f334a9d892e0b20d42f1.tar.gz | |
avformat: Ignore ID3v2 tags if other tags are present e.g. vorbis
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mp3dec.c')
| -rw-r--r-- | libavformat/mp3dec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 099ca57d24..b45a066686 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -349,6 +349,9 @@ static int mp3_read_header(AVFormatContext *s) int ret; int i; + s->metadata = s->internal->id3v2_meta; + s->internal->id3v2_meta = NULL; + st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); |