FFmpeg git repo
Go to file
Michael Niedermayer 4121148388 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avconv: make -frames work for all types of streams, not just video.
  bfi: K&R cosmetics
  bgmc: K&R cleanup
  rawdec: Set start_time to 0 for raw audio files.
  Detect 'yuv2' as rawvideo also in avi.
  rawdec: propagate pict_type information to the output frame
  rawdec: Support more QT 1bpp rawvideo files.
  avconv: free bitstream filters
  threads: limit the number of automatic threads to MAX_AUTO_THREADS
  avplay: K&R cleanup
  fate: use rgb24 as output format for dfa tests
  threads: set thread_count to 1 when thread support is disabled
  threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264

Conflicts:
	ffplay.c
	libavcodec/avcodec.h
	libavcodec/pthread.c
	libavcodec/version.h
	tests/ref/fate/dfa1
	tests/ref/fate/dfa10
	tests/ref/fate/dfa11
	tests/ref/fate/dfa2
	tests/ref/fate/dfa3
	tests/ref/fate/dfa4
	tests/ref/fate/dfa5
	tests/ref/fate/dfa6
	tests/ref/fate/dfa7
	tests/ref/fate/dfa8
	tests/ref/fate/dfa9

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-02 03:10:30 +01:00
doc vf_tinterlace: implement interlace mode 5 2012-01-01 16:16:50 +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-02 03:10:30 +01:00
libavdevice lavd/lavfi: fix compiler warning for uninitialized variables 2011-12-31 11:51:56 +01:00
libavfilter af_astreamsync: remove unused variable 2012-01-01 16:43:32 +01:00
libavformat rawdec: Set start_time to 0 for raw audio files. 2012-01-01 22:27:04 +01:00
libavutil Avoid uninitialized data in lcldec when ofs is 0 in MSZH. 2011-12-31 16:31:15 +01:00
libpostproc libpostproc: increase LIBPOSTPROC_VERSION_MICRO to 100 2011-12-22 03:07:13 +01:00
libswresample swr: fix swresample_version() 2011-12-23 23:26:02 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-12-27 01:19:18 +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-02 03:10:30 +01:00
tools Merge remote-tracking branch 'qatar/master' 2011-12-31 01:16:45 +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-02 03:10:30 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-01-01 00:07:31 +01:00
cmdutils_common_opts.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
cmdutils.c Update copyright year. 2012-01-01 05:04:25 +01:00
cmdutils.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure Merge remote-tracking branch 'qatar/master' 2012-01-01 00:07:31 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-01-02 03:10:30 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-01-02 03:10:30 +01:00
ffprobe.c ffprobe: add XML writer 2011-12-27 12:58:24 +01:00
ffserver.c ff* tools: move descriptions from copyright header to @file doxy 2011-12-27 12:58:08 +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 v410 encoder and decoder 2011-12-14 03:38:57 +01:00
Makefile Makefile: fix path to ffprobe.xsd 2011-12-27 22:29:40 +01:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE RELEASE: We're now at 0.9.0.git 2011-12-16 15:20:13 +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.