Commit Graph

13 Commits

Author SHA1 Message Date
Michael Niedermayer
794006f8fe 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>
2012-01-12 01:10:32 +01:00
Reinhard Tartler
cf53a2127b Add some missing changelog entries and release 0.8_beta2
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2012-01-11 11:45:23 +01:00
Dominique Leuenberger
5aac76159e RELEASE: We're now at 0.9.1.git 2012-01-10 19:19:53 +01:00
Reinhard Tartler
be00d2e174 Prepare for 0.8_beta1 snapshot release 2011-12-23 15:38:15 +01:00
Dominique Leuenberger
39f59a8da7 RELEASE: We're now at 0.9.0.git
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:20:13 +01:00
Dominique Leuenberger
12d276531c RELEASE: We're now at 0.8.7.git
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 14:37:35 +01:00
Dominique Leuenberger
05423d3afd RELEASE: bump to 0.8.6.git after the release
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 21:00:13 +01:00
Dominique Leuenberger
4839fafc1c RELEASE: 0.8.5 has been released
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-03 23:32:22 +02:00
Dominique Leuenberger
bfea160094 RELEASE: set to 0.8.4.git after the release from 2011-09-22
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27 21:32:17 +02:00
Dominique Leuenberger
0a7164a191 set Release to 0.8.2.git. We are at 0.8.2 and a bit further. 2011-08-13 03:39:58 +02:00
Dominique Leuenberger
8ced6f52dd RELEASE: We are git after 0.8 release 2011-07-12 01:46:21 +02:00
Michael Niedermayer
971c04066c make the RELEASE file say git and not 0.7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-09 00:28:16 +02:00
Reinhard Tartler
8fab4007c8 Use the contents of RELEASE as version fallback instead of 'UNKNOWN'
This makes binaries produced by source tarballs identify themselves with
the version number of the corresponding release series, unless overriden
by a 'VERSION' file.
2011-06-19 19:54:07 +02:00