Merge commit '10f160768b824f00933f33bc69f1fae89a25dfc8'

* commit '10f160768b824f00933f33bc69f1fae89a25dfc8':
  g722: Reduce number of pointers passed to g722_apply_qmf() function

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

diff --cc libavcodec/g722dec.c
Simple merge

diff --cc libavcodec/g722dsp.c
Simple merge

diff --cc libavcodec/g722dsp.h
Simple merge

diff --cc libavcodec/g722enc.c
Simple merge