1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavformat
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
..
2011-12-12 20:21:47 +01:00
2011-12-24 23:21:40 +01:00
2011-12-24 03:41:50 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2011-12-13 21:08:43 +01:00
2011-11-30 20:34:45 +01:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00
2011-12-04 16:44:20 +01:00
2011-12-29 15:25:07 +01:00
2011-12-30 20:00:53 +01:00
2011-12-31 02:27:11 +01:00
2011-12-30 01:44:47 +01:00
2011-12-20 22:38:53 +01:00
2011-12-18 16:23:16 +01:00
2012-01-09 11:02:21 +01:00
2011-12-18 23:54:56 +01:00
2011-11-30 17:39:32 +02:00
2011-12-19 19:11:49 +01:00
2011-12-16 06:02:14 +01:00
2012-01-07 09:59:15 -05:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00