Merge commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 17:06:50 +0000 (18:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 17:06:57 +0000 (18:06 +0100)
commitf900fd5d31dcabc138a0f96511ddbf8e9a279765
tree6f06f48f6d960089a4d7452e857d85f202529f23
parent70270f27538f7f6a5e1e5b199b1bbee5972632f4
parent2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e
Merge commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e'

* commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e':
  dsputil: remove 9/10 bits hpel functions.

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