[FFmpeg-cvslog] Merge commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0'
Michael Niedermayer
git at videolan.org
Wed Feb 20 11:21:39 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 20 11:14:08 2013 +0100| [088f20a33251502851958a2b5468dbe07fbf3ff6] | committer: Michael Niedermayer
Merge commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0'
* commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0':
h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil
Conflicts:
libavcodec/dsputil.c
libavcodec/h264.c
libavcodec/h264_mb_template.c
libavcodec/h264addpx_template.c
libavcodec/h264dsp.c
libavcodec/h264dsp.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=088f20a33251502851958a2b5468dbe07fbf3ff6
---
More information about the ffmpeg-cvslog
mailing list