aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-24 14:03:55 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-24 14:03:55 +0100
commit83e89787984d3f96cb793ebfddc6078d6bc50073 (patch)
treebe7e09b4e106d85247a3650aa7ff578071482577 /README
parent595ba3b96258538566d6f42113dd0180aaee87c4 (diff)
parent5a7e35dd2351c30bab45177b9482cb8833a0ca78 (diff)
downloadffmpeg-83e89787984d3f96cb793ebfddc6078d6bc50073.tar.gz
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>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions