Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 13:03:55 +0000 (14:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 13:03:55 +0000 (14:03 +0100)
commit83e89787984d3f96cb793ebfddc6078d6bc50073
treebe7e09b4e106d85247a3650aa7ff578071482577
parent595ba3b96258538566d6f42113dd0180aaee87c4
parent5a7e35dd2351c30bab45177b9482cb8833a0ca78
Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'

* commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78':
  Add replaygain side data type and code for parsing replaygain tags.

Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavformat/replaygain.c
libavformat/replaygain.h
libavutil/Makefile
libavutil/frame.h
libavutil/replaygain.h
libavutil/version.h