Michael Niedermayer c08e523586 Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f' ...

* commit '4a0f6651434c6f213d830140f575b4ec7858519f':
  libavcodec: when decoding, copy replaygain side data to decoded frames

Conflicts:
	libavcodec/internal.h
	libavcodec/rawdec.c
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-03-24 14:26:17 +01:00

7.7 KiB

Raw Blame History

View Raw