[FFmpeg-cvslog] Merge commit 'd82f188504410fdfa446c5682c128c31bb5851a4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 24 14:10:44 2012 +0200| [5cf794e0c1f7b651de4b1a61a6786fb71e9679b3] | committer: Michael Niedermayer

Merge commit 'd82f188504410fdfa446c5682c128c31bb5851a4'

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

Conflicts:
	libavutil/lzo.h

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

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