Merge commit '2c01ad8b206d326700974438f7193f22be416eb1'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 13:59:50 +0000 (14:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 13:59:50 +0000 (14:59 +0100)
commite9c6b93bdaa600cd31f689218600baa999f8365e
tree9b8b05c015e2b609481c35beb8729a053776ba6a
parent0371eaebcd1bdcd94e4c9fccf23969c5f49bb5d0
parent2c01ad8b206d326700974438f7193f22be416eb1
Merge commit '2c01ad8b206d326700974438f7193f22be416eb1'

* commit '2c01ad8b206d326700974438f7193f22be416eb1':
  dsputil_template: Detemplatize the code

Conflicts:
libavcodec/dsputil.c

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