Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Oct 2012 12:01:29 +0000 (14:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Oct 2012 12:01:36 +0000 (14:01 +0200)
* 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@gmx.at>

No differences found