Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 00:45:50 +0000 (01:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 00:46:35 +0000 (01:46 +0100)
commit47df21e1727c83648a645b0dde34e99f1b7bdc93
treeed098a84b05dde35955ca00471464be09a6eba78
parent38e641a060e0c00930851a8053ca96250b3ecccc
parent67690683130faf37dd9d969ced15eba2a1940ade
Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'

* commit '67690683130faf37dd9d969ced15eba2a1940ade':
  g722: Split out g722_qmf_apply() function into g722dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/g722.c
libavcodec/g722.h
libavcodec/g722dec.c
libavcodec/g722dsp.c
libavcodec/g722dsp.h
libavcodec/g722enc.c