[FFmpeg-cvslog] Merge commit '47e5a98174eb9c07ad17be71df129719d60ec8b7'
Michael Niedermayer
git at videolan.org
Sat Apr 20 13:59:50 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 13:52:58 2013 +0200| [055e5c8e01c57783207861c96a5affbcd9e40160] | committer: Michael Niedermayer
Merge commit '47e5a98174eb9c07ad17be71df129719d60ec8b7'
* commit '47e5a98174eb9c07ad17be71df129719d60ec8b7':
ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/hpeldsp.h
libavcodec/ppc/hpeldsp_altivec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=055e5c8e01c57783207861c96a5affbcd9e40160
---
More information about the ffmpeg-cvslog
mailing list