diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 23:17:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 23:17:33 +0200 |
| commit | 849a8c4cdb70f38a45ccd68d95c5ef3e87bd2815 (patch) | |
| tree | a08e6b403a476a5dd9a72de4211d440c1152aa85 /libavformat/Makefile | |
| parent | 8e8c8607fc23c9b9555ba62ffd66783339f38ee3 (diff) | |
| parent | 0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4 (diff) | |
Merge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4'
* commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4':
oggparsevorbis: export replaygain tags from Vorbis comments
Conflicts:
libavformat/Makefile
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 067d759745..0fac33efe7 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -267,6 +267,7 @@ OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ oggparsetheora.o \ oggparsevorbis.o \ oggparsevp8.o \ + replaygain.o \ vorbiscomment.o \ flac_picture.o OBJS-$(CONFIG_OGG_MUXER) += oggenc.o \ |