Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 13:26:17 +0000 (14:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 13:26:17 +0000 (14:26 +0100)
commitc08e523586b6be36bee3f73d609733cd80a57674
tree5d728f8f5c8647e7ffe3197c25875a1b3dee380d
parent83e89787984d3f96cb793ebfddc6078d6bc50073
parent4a0f6651434c6f213d830140f575b4ec7858519f
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>
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c