From 1d55f8d5f6f2cd74fa27170e2be37a72441d9202 Mon Sep 17 00:00:00 2001 From: Alessandro Ghedini Date: Fri, 4 Apr 2014 11:50:45 +0200 Subject: [PATCH] flacdec: export replaygain tags from Vorbis comments Signed-off-by: Anton Khirnov --- libavformat/Makefile | 1 + libavformat/flacdec.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/libavformat/Makefile b/libavformat/Makefile index 5e1f948e0b..8be9e2d9ad 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -116,6 +116,7 @@ OBJS-$(CONFIG_FILMSTRIP_MUXER) += filmstripenc.o OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o rawdec.o \ flac_picture.o \ oggparsevorbis.o \ + replaygain.o \ vorbiscomment.o OBJS-$(CONFIG_FLAC_MUXER) += flacenc.o flacenc_header.o \ vorbiscomment.o diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index ecbb7ec0ef..11360a9da1 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -26,6 +26,7 @@ #include "rawdec.h" #include "oggdec.h" #include "vorbiscomment.h" +#include "replaygain.h" #include "libavcodec/bytestream.h" static int flac_read_header(AVFormatContext *s) @@ -146,6 +147,10 @@ static int flac_read_header(AVFormatContext *s) } } + ret = ff_replaygain_export(st, s->metadata); + if (ret < 0) + return ret; + return 0; }