ffmpeg/RELEASE at b473c9937ebe9aafef9d2e07f080fb12ecc53ef4 - ffmpeg - Atria-soft GIT

generic-library/ffmpeg

Michael Niedermayer 5555d2075a 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@gmx.at>

2012-10-24 14:01:36 +02:00

1 line

7 B

Plaintext

Raw Blame History

1.0.git