diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 22:59:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 22:59:28 +0200 |
| commit | 8e8c8607fc23c9b9555ba62ffd66783339f38ee3 (patch) | |
| tree | b1d108dc8832fac2c333316c3cf0a761040296f8 /libavformat/flacdec.c | |
| parent | c1d053621c2c437505c22321e12b2d2e71976a00 (diff) | |
| parent | 1d55f8d5f6f2cd74fa27170e2be37a72441d9202 (diff) | |
| download | ffmpeg-8e8c8607fc23c9b9555ba62ffd66783339f38ee3.tar.gz | |
Merge commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202'
* commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202':
flacdec: export replaygain tags from Vorbis comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flacdec.c')
| -rw-r--r-- | libavformat/flacdec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 29310b831f..bbbbf66273 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) @@ -143,6 +144,10 @@ static int flac_read_header(AVFormatContext *s) } } + ret = ff_replaygain_export(st, s->metadata); + if (ret < 0) + return ret; + return 0; fail: |