Merge commit '68d8238cca52e50e8cc81bf2edcaf8088c52d4c0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 07:40:02 +0000 (09:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 07:42:07 +0000 (09:42 +0200)
commit23de9e91df1c855a89a468ee7cf203dcf0bab41f
tree19b8bf9f44dd79385270e7f43a92b1c81207f607
parent6c9d28a2294de86519c7c613c76394c66dcfd83c
parent68d8238cca52e50e8cc81bf2edcaf8088c52d4c0
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>
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h