Merge commit '70d246d5cc3d214da11f711d997d8cbd8c3a23d1'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 21:34:54 +0000 (22:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 21:34:54 +0000 (22:34 +0100)
commit89c35b113060a00bc57ee67c5ebc29ea500d5160
tree48f3a2e646ace61b3e62c3d748c638f4e414d9f0
parentc16896f52551116aa3dda7b60854f0b044913105
parent70d246d5cc3d214da11f711d997d8cbd8c3a23d1
Merge commit '70d246d5cc3d214da11f711d997d8cbd8c3a23d1'

* commit '70d246d5cc3d214da11f711d997d8cbd8c3a23d1':
  flacenc: initialize sums matrix

Conflicts:
libavcodec/flacenc.c

No change, the table does not exist in FFmpeg in this form anymore

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