diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 09:40:02 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 09:42:07 +0200 |
commit | 23de9e91df1c855a89a468ee7cf203dcf0bab41f (patch) | |
tree | 19b8bf9f44dd79385270e7f43a92b1c81207f607 /libavcodec/yuv4enc.c | |
parent | 6c9d28a2294de86519c7c613c76394c66dcfd83c (diff) | |
parent | 68d8238cca52e50e8cc81bf2edcaf8088c52d4c0 (diff) | |
download | ffmpeg-23de9e91df1c855a89a468ee7cf203dcf0bab41f.tar.gz |
Merge commit '68d8238cca52e50e8cc81bf2edcaf8088c52d4c0'
* commit '68d8238cca52e50e8cc81bf2edcaf8088c52d4c0':
hpeldsp: Add half-pel functions (currently copies of dsputil)
Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/yuv4enc.c')
0 files changed, 0 insertions, 0 deletions