aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/replaygain.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-22 03:35:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-22 03:35:29 +0200
commitc933f2c4cca367eed87de92e059f222486b66309 (patch)
tree0c5ff46211622b35173b33b8066a0c3f3d3313f1 /libavformat/replaygain.c
parent135b1a3f2c7985b8336d170419aec6e30cd78043 (diff)
parent16e6652286213014c28a9c3af70435e767d28638 (diff)
downloadffmpeg-c933f2c4cca367eed87de92e059f222486b66309.tar.gz
Merge commit '16e6652286213014c28a9c3af70435e767d28638'
* commit '16e6652286213014c28a9c3af70435e767d28638': aarch64: NEON intrinsics dct_unquantize_h263. Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/replaygain.c')
0 files changed, 0 insertions, 0 deletions