[FFmpeg-cvslog] Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be'
Michael Niedermayer
git at videolan.org
Tue May 14 10:32:32 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 14 10:18:46 2013 +0200| [eda9d97b7a1dcebc6684f88e4f6472e18bd6b9f0] | committer: Michael Niedermayer
Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be'
* commit '46bb456853b197f4562de7acf5d42abf11ded9be':
x86: dsputil: Refactor pixels16 wrapper functions with a macro
Conflicts:
libavcodec/x86/hpeldsp_avg_template.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eda9d97b7a1dcebc6684f88e4f6472e18bd6b9f0
---
More information about the ffmpeg-cvslog
mailing list