Michael Niedermayer 088f20a332 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@gmx.at>

2013-02-20 11:17:32 +01:00

99 KiB

Raw Blame History

View Raw