1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
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
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
libswscale
mt-work
tests ffmdec: fix seeking for non indexed files 2011-09-08 20:53:37 +02:00
tools
.gitignore
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
cmdutils.c
cmdutils.h
common.mak
configure
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
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
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
subdir.mak
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.