summaryrefslogtreecommitdiff
path: root/RELEASE
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-24 14:01:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-24 14:01:36 +0200
commit5555d2075a26fc778fb8145473100e94d80a00c8 (patch)
tree95d4f5649f7c2410d814b18c7bbe868c82b83cbe /RELEASE
parentf3b8096bc0e7df9e45db1023d6e6e7bff177d0c4 (diff)
parentceb754d041f5f6327fd9195a5f43575af9516daa (diff)
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>
Diffstat (limited to 'RELEASE')
-rw-r--r--RELEASE2
1 files changed, 1 insertions, 1 deletions
diff --git a/RELEASE b/RELEASE
index 4402ec2c05..014ccf1a01 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1.0.git
+1.0.git \ No newline at end of file