ffmpeg/tools
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
..
build_libstagefright Merge remote-tracking branch 'hexene/stagefright' 2012-01-10 20:59:44 +01:00
clean-diff
cws2fws.c tests/tools/examples: Replace direct exit() calls by return. 2011-12-08 01:00:58 +01:00
enum_options.c
graph2dot.c
lavfi-showfiltfmts.c lavfi-showfiltfmts.c: fix handling of null names 2011-11-26 18:12:25 +01:00
patcheck Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
pktdumper.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
probetest.c
qt-faststart.c Merge remote-tracking branch 'qatar/master' 2011-12-31 01:16:45 +01:00
trasher.c
unwrap-diff