Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 14:11:08 +0000 (15:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 14:11:08 +0000 (15:11 +0100)
commit1034fbdf53003eb74ad30576d1f2205abc429357
treebab68afb4da4a0f38228a697f158812f04706c5c
parent8de75f703adafced474ddf748c46d091ee0a8f4a
parent15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7
Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'

* commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7':
  mp3dec: export replaygain tags from ID3v2

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/Makefile
libavformat/mp3dec.c