Merge commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 10:14:08 +0000 (11:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 10:17:32 +0000 (11:17 +0100)
commit088f20a33251502851958a2b5468dbe07fbf3ff6
tree3f1352e9e2824d5a9a2cfd7989cd5c5ceb577086
parent536d1ed7934d2c9c818dd833e1058eaab479d51d
parent2ed008204d5467be03a0a3af1e293b2f7038d0a0
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>
libavcodec/dsputil.c
libavcodec/h264.c