Merge commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 13:36:23 +0000 (15:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 13:36:23 +0000 (15:36 +0200)
commitd2d2c309e8f3bbe24d9592aec87c5875473f623b
tree63cb3ae6b3073b8a29cd8b96bbaef86a85c6f3b2
parent6ec26157b96b74a26c5148bffbf862920a1afc34
parent54cd5e4f92de6bd0fb8e24069153b0156c8136bc
Merge commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc'

* commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc':
  dsputil: Remove hpel functions (moved to hpeldsp)

Conflicts:
libavcodec/hpeldsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hpeldsp.h
libavcodec/vc1dsp.h