diff options
| author | Michael Niedermayer <[email protected]> | 2013-04-20 09:40:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-04-20 09:42:07 +0200 |
| commit | 23de9e91df1c855a89a468ee7cf203dcf0bab41f (patch) | |
| tree | 19b8bf9f44dd79385270e7f43a92b1c81207f607 /libavfilter/vf_unsharp.c | |
| parent | 6c9d28a2294de86519c7c613c76394c66dcfd83c (diff) | |
| parent | 68d8238cca52e50e8cc81bf2edcaf8088c52d4c0 (diff) | |
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 <[email protected]>
Diffstat (limited to 'libavfilter/vf_unsharp.c')
0 files changed, 0 insertions, 0 deletions