Merge commit '10f160768b824f00933f33bc69f1fae89a25dfc8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 00:54:14 +0000 (01:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 00:54:19 +0000 (01:54 +0100)
* commit '10f160768b824f00933f33bc69f1fae89a25dfc8':
  g722: Reduce number of pointers passed to g722_apply_qmf() function

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

Simple merge
Simple merge
Simple merge
Simple merge