diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 09:57:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 10:01:54 +0200 |
| commit | 3c6621708b9392cd8a11dab6bb9e98f1804dcf47 (patch) | |
| tree | 15448e4fb4e74679163dd334cf37fccb56a3401a /libavcodec/acelp_pitch_delay.h | |
| parent | 23de9e91df1c855a89a468ee7cf203dcf0bab41f (diff) | |
| parent | 8071264f2196d71ff49c3944c33f8d3d83f548f1 (diff) | |
| download | ffmpeg-3c6621708b9392cd8a11dab6bb9e98f1804dcf47.tar.gz | |
Merge commit '8071264f2196d71ff49c3944c33f8d3d83f548f1'
* commit '8071264f2196d71ff49c3944c33f8d3d83f548f1':
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: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/acelp_pitch_delay.h')
0 files changed, 0 insertions, 0 deletions