[FFmpeg-cvslog] Merge commit '6d25c9db11e87ec58652de6588448225137b0c57'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 11:26:43 2013 +0200| [3bc3c78a59d3ab2e62970e6a6531a93bb1b3b15c] | committer: Michael Niedermayer

Merge commit '6d25c9db11e87ec58652de6588448225137b0c57'

* commit '6d25c9db11e87ec58652de6588448225137b0c57':
  dsputil: Make square put/avg_pixels functions local to h264qpel

Conflicts:
	libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bc3c78a59d3ab2e62970e6a6531a93bb1b3b15c
---