[FFmpeg-cvslog] Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 23 13:30:51 2012 +0100| [25ca8aef54b65c77ed36ab5a6877eba18560e6b8] | committer: Michael Niedermayer

Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'

* commit '4a606c830ae664013cea33800094d4d0f4ec62da':
  av_memcpy_backptr: optimise some special cases
  mpegvideo: simplify dxy calculation in hpel_motion()
  build: add rules to generate preprocessed source files

Conflicts:
	Makefile
	libavutil/mem.c
	library.mak

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

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