diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 14:47:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:04:06 +0200 |
| commit | 4bdec0e71edc3b46793908eaca26864657497cc1 (patch) | |
| tree | 0d99dce037fa8b08d7452ee7220f5eca32841a63 /libavcodec/sparc | |
| parent | c5a11ab6d1067f8306b318b9fda10b106389cea0 (diff) | |
| parent | 278bd2054ca61ab70dfe38f1774409cda2da5359 (diff) | |
| download | ffmpeg-4bdec0e71edc3b46793908eaca26864657497cc1.tar.gz | |
Merge commit '278bd2054ca61ab70dfe38f1774409cda2da5359'
* commit '278bd2054ca61ab70dfe38f1774409cda2da5359':
sh4: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
libavcodec/sh4/dsputil_align.c
libavcodec/sh4/dsputil_sh4.h
libavcodec/sh4/hpeldsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sparc')
0 files changed, 0 insertions, 0 deletions