No description
Find a file
Michael Niedermayer d6a55ab016 Merge commit 'be209bdabb' into release/0.10
* commit 'be209bdabb':
  vf_pad: don't give up its own reference to the output buffer.
  libvorbis: use VBR by default, with default quality of 3
  libvorbis: fix use of minrate/maxrate AVOptions
  h264: fix deadlocks on incomplete reference frame decoding.
  cmdutils: avoid setting data pointers to invalid values in alloc_buffer()
  avidec: return 0, not packet size from read_packet().
  wmapro: prevent division by zero when sample rate is unspecified
  vc1dec: check that coded slice positions and interlacing match.
  alsdec: fix number of decoded samples in first sub-block in BGMC mode.
  alsdec: remove dead assignments
  alsdec: Fix out of ltp_gain_values read.
  alsdec: Check that quantized parcor coeffs are within range.
  alsdec: Check k used for rice decoder.

Conflicts:
	avconv.c
	libavcodec/h264.c
	libavcodec/libvorbis.c
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-25 17:02:46 +02:00
doc Clarify that -passlogfile has a different syntax when used with -vcodec libx264. 2012-08-31 14:17:01 +02:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge commit 'be209bdabb' into release/0.10 2012-10-25 17:02:46 +02:00
libavdevice buildsystem: 10l add v4l entry back 2012-01-25 00:46:41 +01:00
libavfilter Merge commit 'be209bdabb' into release/0.10 2012-10-25 17:02:46 +02:00
libavformat Merge commit 'be209bdabb' into release/0.10 2012-10-25 17:02:46 +02:00
libavutil Merge remote-tracking branch 'qatar/release/0.8' into release/0.10 2012-10-16 04:25:51 +02:00
libpostproc build: Allow building old API/ABI libpostproc version 2012-01-24 17:01:10 +01:00
libswresample libswresample: introduce int swr_set_compensation() instead of void swr_compensate() 2012-01-09 04:16:06 +01:00
libswscale Merge remote-tracking branch 'qatar/release/0.8' into release/0.10 2012-03-16 09:01:08 +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/release/0.8' into release/0.10 2012-10-16 04:25:51 +02:00
tools ismindex: Fix build on mingw 2012-01-26 22:25:29 +01:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
Changelog Changelog for 0.10.5 2012-09-19 03:09:28 +02:00
cmdutils.c cmdutils: update copyright year to 2012. 2012-06-08 12:38:58 +02:00
cmdutils.h Read preset files with suffix .avpreset 2012-04-29 22:07:01 +02:00
cmdutils_common_opts.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 dxva2: include dxva.h if found 2012-09-13 04:45:36 +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 Update for 0.10.5 2012-09-19 02:34:55 +02:00
ffmpeg.c Merge commit 'be209bdabb' into release/0.10 2012-10-25 17:02:46 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
ffprobe.c ffprobe: increase precision for the shown float values 2012-01-20 13:27:57 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-01-23 01:05:20 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak build: Fix some paths in uninstall-libs 2012-09-13 04:47:57 +02:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS maintainers: add myself for recent works. 2012-01-24 16:07:53 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE Update for 0.10.5 2012-09-19 02:34:55 +02:00
VERSION Update for 0.10.5 2012-09-19 02:34:55 +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.