Merge commit '73ae0a9d12857852222363f9a7c14d07058ebfd3'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 01:07:39 +0000 (02:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 01:07:42 +0000 (02:07 +0100)
* commit '73ae0a9d12857852222363f9a7c14d07058ebfd3':
  g722: Split out computation of band->s_zero and unroll code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/g722.c

Simple merge