• Michael Niedermayer's avatar
    Merge commit '8071264f' · 3c662170
    Michael Niedermayer authored
    * commit '8071264f
    
    ':
      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: default avatarMichael Niedermayer <michaelni@gmx.at>
    3c662170