Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 13:11:06 +0000 (15:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 13:11:06 +0000 (15:11 +0200)
* commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493':
  sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp

Conflicts:
libavcodec/hpeldsp.h
libavcodec/sparc/dsputil_vis.c
libavcodec/sparc/hpeldsp_vis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/sparc/dsputil_vis.c
libavcodec/sparc/hpeldsp_vis.c
libavcodec/sparc/vis.h

Simple merge
Simple merge
Simple merge