[FFmpeg-cvslog] Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 16 01:45:50 2015 +0100| [47df21e1727c83648a645b0dde34e99f1b7bdc93] | committer: Michael Niedermayer

Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47df21e1727c83648a645b0dde34e99f1b7bdc93
---