summaryrefslogtreecommitdiff
path: root/RELEASE
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-12 00:52:40 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-12 01:10:32 +0100
commit794006f8fe403ccd2993513a8e4fbe885ef7f9fb (patch)
tree42edca40fc6f5ba24543f611086891ae4c6b6f68 /RELEASE
parent4093d130d1934edcd098014d306492173527f1f6 (diff)
parente7d02b04dcfb65d1873b81bd3281442ac5ddec1d (diff)
downloadffmpeg-794006f8fe403ccd2993513a8e4fbe885ef7f9fb.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: fft: init functions with INIT_XMM/YMM. pcmenc: set frame_size to 0. gsm demuxer: use generic seeking instead of a gsm-specific function. gsm demuxer: return packets with only 1 gsm block at a time. avcodec: add GSM parser doc: Replace ffmpeg references in avserver config file by avconv. doc: Fix names of av_log color environment variables. Fix a bunch of platform name and other typos. Add some missing changelog entries and release 0.8_beta2 No longer build libpostproc by default wtv: fix memleaks during normal operation threads: add CODEC_CAP_AUTO_THREADS for libvpx and xavs Conflicts: Changelog RELEASE cmdutils.c configure doc/ffserver.conf doc/platform.texi ffplay.c libavcodec/Makefile libavcodec/version.h libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'RELEASE')
-rw-r--r--RELEASE1
1 files changed, 1 insertions, 0 deletions
diff --git a/RELEASE b/RELEASE
index 4fda45b376..ba03fc9fdb 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1,2 @@
0.9.1.git
+