[FFmpeg-cvslog] Merge commit '68d8238cca52e50e8cc81bf2edcaf8088c52d4c0'
Michael Niedermayer
git at videolan.org
Sat Apr 20 09:52:53 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 09:40:02 2013 +0200| [23de9e91df1c855a89a468ee7cf203dcf0bab41f] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23de9e91df1c855a89a468ee7cf203dcf0bab41f
---
More information about the ffmpeg-cvslog
mailing list