Merge commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Apr 2014 20:59:24 +0000 (22:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Apr 2014 20:59:28 +0000 (22:59 +0200)
commit8e8c8607fc23c9b9555ba62ffd66783339f38ee3
treeb1d108dc8832fac2c333316c3cf0a761040296f8
parentc1d053621c2c437505c22321e12b2d2e71976a00
parent1d55f8d5f6f2cd74fa27170e2be37a72441d9202
Merge commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202'

* commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202':
  flacdec: export replaygain tags from Vorbis comments

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