• Michael Niedermayer's avatar
    Merge commit 'ceb754d0' · 5555d207
    Michael Niedermayer authored
    * commit 'ceb754d0
    
    ':
      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: default avatarMichael Niedermayer <michaelni@gmx.at>
    5555d207