Merge commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:37:28 +0000 (00:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:37:28 +0000 (00:37 +0100)
commit16f619f57c07f518d4d9fa8de3f23540174ff8ef
tree7ecc4d2a9e5bef02196731b15feb911b0b6bbe9e
parentdd7c2e9bce0ca704c6dd725cb7b1cb3bedacdb75
parent635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150
Merge commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150'

* commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150':
  dsputil: Merge variable declarations and initializations

Conflicts:
libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.c
libavcodec/dsputil_template.c