diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:11:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:11:06 +0200 |
| commit | fdb1f7eb7a802eec63a051499110842f3056cf9b (patch) | |
| tree | c4421b73f26a9e16602438641af598b48958a82b /libavcodec/hpeldsp.h | |
| parent | 4bdec0e71edc3b46793908eaca26864657497cc1 (diff) | |
| parent | 78ce568e43a7f3993c33100aa8f5d56c4c4bd493 (diff) | |
Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'
* 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>
Diffstat (limited to 'libavcodec/hpeldsp.h')
0 files changed, 0 insertions, 0 deletions