aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mp3dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-04 22:52:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-04 22:52:12 +0200
commitc1d053621c2c437505c22321e12b2d2e71976a00 (patch)
treefe12c2e130fe792324ef0408184bb82acd981c24 /libavformat/mp3dec.c
parent652061313979b99f91b27309ecd8baeef7b7865f (diff)
parent8542f9c4f17125d483c40c0c5723842f1c982f81 (diff)
downloadffmpeg-c1d053621c2c437505c22321e12b2d2e71976a00.tar.gz
Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'
* commit '8542f9c4f17125d483c40c0c5723842f1c982f81': replaygain: correctly parse peak values Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mp3dec.c')
0 files changed, 0 insertions, 0 deletions