Merge commit '8071264f2196d71ff49c3944c33f8d3d83f548f1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 07:57:00 +0000 (09:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 08:01:54 +0000 (10:01 +0200)
* commit '8071264f2196d71ff49c3944c33f8d3d83f548f1':
  interplayvideo: Use hpeldsp instead of dsputil for half-pel functions
  bink: Use hpeldsp instead of dsputil for half-pel functions
  indeo3: Use hpeldsp instead of dsputil for half-pel functions
  vp56: Use hpeldsp instead of dsputil for half-pel functions
  vp3: Use hpeldsp instead of dsputil for half-pel functions

Conflicts:
libavcodec/bink.c
libavcodec/indeo3.c
libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/vp56.c

Simple merge