Fork of FFmpeg for xenia's usage. Branched from latest release. On changes use a git rebase strategy when applicable!
Go to file
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
doc Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
libavdevice Revert "v4l2: poll the file descriptor" 2012-01-11 14:57:56 +01:00
libavfilter timecode: set a fixed buffer size of 16B for tc string. 2012-01-11 18:14:03 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
libavutil Fix step_minus1 pixel descirption for RGB64. 2012-01-11 10:54:12 +01:00
libpostproc Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
libswresample libswresample: introduce int swr_set_compensation() instead of void swr_compensate() 2012-01-09 04:16:06 +01:00
libswscale sws: Remove unneeded YUV cliping from yuv2rgb_X_c_template() 2012-01-11 21:29:59 +01:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
tools Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
.gitignore doc: fate: Support building a plain text version 2011-12-20 16:05:01 +01:00
avconv.c Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
cmdutils_common_opts.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
cmdutils.h cmdutils: make this_year extern, so it can be referenced from other .o files 2012-01-07 11:02:13 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Fix a bunch of platform name and other typos. 2012-01-11 13:48:30 +01:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
ffplay.c ffplay: Exit on ctrl-c. 2012-01-09 23:22:56 +01:00
ffprobe.c ffprobe: use av_toupper() in upcase_string() 2012-01-10 22:49:15 +01:00
ffserver.c ffserver: check chdir() return 2012-01-08 00:18:36 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS MAINTAINERS: update release maintainers 2012-01-02 16:01:33 +01:00
Makefile Makefile: fix path to ffprobe.xsd 2011-12-27 22:29:40 +01:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.