diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:24:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:24:25 +0200 |
| commit | 6ec26157b96b74a26c5148bffbf862920a1afc34 (patch) | |
| tree | e42fc16ac43e0ce3d5a03f596b50b4c03caebae6 /libavcodec/pnm.h | |
| parent | fdb1f7eb7a802eec63a051499110842f3056cf9b (diff) | |
| parent | 2957d29f0531ccd8a6f4378293424dfd92db3044 (diff) | |
| download | ffmpeg-6ec26157b96b74a26c5148bffbf862920a1afc34.tar.gz | |
Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044'
* commit '2957d29f0531ccd8a6f4378293424dfd92db3044':
alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/alpha/dsputil_alpha.c
libavcodec/alpha/hpeldsp_alpha.c
libavcodec/alpha/hpeldsp_alpha.h
libavcodec/alpha/hpeldsp_alpha_asm.S
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnm.h')
0 files changed, 0 insertions, 0 deletions