Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Nov 2012 12:30:51 +0000 (13:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Nov 2012 12:30:51 +0000 (13:30 +0100)
commit25ca8aef54b65c77ed36ab5a6877eba18560e6b8
tree5e90ca85f7a2364a156154e8c9bbc8ca75018736
parente9c372362cb736240dcd87658a027ecfb7b9d240
parent4a606c830ae664013cea33800094d4d0f4ec62da
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@gmx.at>
Makefile
common.mak
configure
libavcodec/mpegvideo_motion.c
libavutil/mem.c
library.mak