Go to file
Michael Niedermayer 7db7eb08e0 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks.
  avconv: move audio_channels to the options context.
  avconv: move *_disable to options context.
  avconv: remove -[vas]lang options.
  avconv: move codec tags to options context.
  cljr: init_get_bits size in bits instead of bytes
  indeo2: fail if input buffer too small
  indeo2: init_get_bits size in bits instead of bytes
  ffv1: Fixed size given to init_get_bits() in decoder.

Conflicts:
	avconv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-10 20:52:48 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-09-10 20:52:48 +02:00
ffpresets Remove libx264 baseline ffpreset 2011-07-28 01:44:57 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-09-10 20:52:48 +02:00
libavdevice dshow: properly disconnect and remove filters from graph 2011-09-06 21:14:51 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2011-09-07 22:58:39 +02:00
libavformat avisynth: Fix upside down bug 2011-09-10 05:24:39 +02:00
libavutil avopt: Fix searching for constants 2011-09-08 05:34:17 +02:00
libpostproc postprocess.c: filter name needs to be double 0 terminated 2011-08-26 20:28:54 +02:00
libswscale swscale: Fix unused asm and enable it 2011-09-05 18:42:44 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests ffmdec: fix seeking for non indexed files 2011-09-08 20:53:37 +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-10 20:52:48 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-09-07 22:58:39 +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 22:29:16 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +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 doxygen: dont generate docs for avconv.c 2011-09-08 17:56:17 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-09-10 20:52:48 +02:00
ffplay.c lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h 2011-09-06 18:51:09 +02:00
ffprobe.c ffprobe: replace specific ## GNU cpp extension with __VA_ARGS__. 2011-09-09 14:40:18 +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 Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01: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 Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01: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.