Go to file
Michael Niedermayer d2084402e6 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavc: fix type for thread_type option
  avconv: move format to options context
  avconv: move limit_filesize to options context
  avconv: move start_time, recording_time and input_ts_offset to options context
  avconv: add a context for options.
  cmdutils: allow storing per-stream/chapter/.... options in a generic way
  cmdutils: split per-option code out of parse_options().
  cmdutils: add support for caller-provided option context.
  cmdutils: declare only one pointer type in OptionDef
  cmdutils: move grow_array() from avconv to cmdutils.
  cmdutils: move exit_program() declaration to cmdutils from avconv
  http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes
  nutenc: add namespace to the api facing functions

Conflicts:
	avconv.c
	cmdutils.c
	cmdutils.h
	ffmpeg.c
	ffplay.c
	ffprobe.c
	ffserver.c
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-05 03:10:45 +02:00
doc av_string: add av_asprintf(). 2011-09-04 09:37:41 +02:00
ffpresets Remove libx264 baseline ffpreset 2011-07-28 01:44:57 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
libavdevice openal-dec: fix missing list_devices unit for list_devices AVOption 2011-09-02 05:28:31 +02:00
libavfilter vf_drawtext: Fix reinit to allow color changes. 2011-09-04 20:58:13 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
libavutil av_string: add av_asprintf(). 2011-09-04 09:37:41 +02:00
libpostproc postprocess.c: filter name needs to be double 0 terminated 2011-08-26 20:28:54 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-09-04 04:11:53 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
tools Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
.gitignore lavc: add a table of all codecs names. 2011-08-22 10:54:44 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
Changelog lavfi: add amovie source - audio movie source 2011-08-27 12:46:55 +02:00
cmdutils_common_opts.h Make all option parsing functions match the function pointer type through which they are called. 2011-06-30 11:49:48 -04:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
configure ffmpeg: fix reading from stdin on windows 2011-09-04 02:14:39 +02: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 Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
MAINTAINERS MAINTAINERS: add a "Releases" section 2011-06-24 11:15:26 +02:00
Makefile Makefile: remove unused PROGS_G. 2011-09-01 20:23:40 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE 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
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-31 00:34:47 +02: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.