aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacpsdsp.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-21 19:15:28 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-21 19:26:01 +0100
commit6a7980e2cd4ba094756215df9172aad87cb1c469 (patch)
tree91c874731ae44848e7c1f85317e3c30fc322eb75 /libavcodec/aacpsdsp.h
parentc0caf7e81493f5d9d4acd013892b651ab39be450 (diff)
parentac0e03bab00182f845cd02d458f404ee30ef0998 (diff)
downloadffmpeg-6a7980e2cd4ba094756215df9172aad87cb1c469.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: dct/fft: Give consistent names to fixed/float template files Conflicts: libavcodec/fft_fixed.c libavcodec/fft_float.c libavcodec/mdct_fixed.c libavcodec/mdct_float.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacpsdsp.h')
0 files changed, 0 insertions, 0 deletions