[FFmpeg-cvslog] Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'
Michael Niedermayer
git at videolan.org
Sat Mar 22 23:03:09 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 22 22:30:20 2014 +0100| [77bc34297596476c1644a497615038d18eed63fe] | committer: Michael Niedermayer
Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'
* commit '322a1dda973e802db7b57f2007fad3efcd5bab81':
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros
Conflicts:
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77bc34297596476c1644a497615038d18eed63fe
---
More information about the ffmpeg-cvslog
mailing list