[FFmpeg-cvslog] Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 24 14:01:29 2012 +0200| [5555d2075a26fc778fb8145473100e94d80a00c8] | committer: Michael Niedermayer

Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'

* commit 'ceb754d041f5f6327fd9195a5f43575af9516daa':
  lzo: Use AV_COPY*U macros where appropriate
  prepare 9_beta2 release
  dsputil: Replace AV_WNxx(AV_RNxx()) combinations by AV_COPYxxU
  intreadwrite: Add AV_COPYxxU macros for copying to/from unaligned addresses
  dxtory: Replace AV_WN16A(AV_RN16A()) combination by AV_COPY16
  mp3: properly forward mp_decode_frame errors

Conflicts:
	RELEASE
	libavcodec/mpegaudiodec.c

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

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