highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-10-24 14:01:29 +02:00
parent f3b8096bc0 ceb754d041
commit 5555d2075a
6 changed files with 62 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE
View File

@@ -1 +1 @@
1.0.git
1.0.git