* commit 'd82f1885':
  Remove need for padding in av_memcpy_backptr()

Conflicts:
	libavutil/lzo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>