No description
Find a file
Michael Niedermayer 57bf0d1fe5 Merge branch 'release/0.7' into oldabi
* release/0.7: (290 commits)
  nuv: Fix combination of size changes and LZO compression.
  av_lzo1x_decode: properly handle negative buffer length.
  Do not call parse_keyframes_index with NULL stream.
  update versions for 0.7 branch
  Version numbers for 0.8.6
  snow: emu edge support Fixes Ticket592
  imc: validate channel count
  imc: check for ff_fft_init() failure (cherry picked from commit 95fee70d67)
  libgsmdec: check output buffer size before decoding (cherry picked from commit b03761b130)
  configure: fix arch x86_32
  mp3enc: avoid truncating id3v1 tags by one byte
  asfdec: Check packet_replic_size earlier
  cin audio: validate the channel count
  binkaudio: add some buffer overread checks.
  atrac1: validate number of channels (cherry picked from commit bff5b2c1ca)
  atrac1: check output buffer size before decoding (cherry picked from commit 33684b9c12)
  vp3: fix oob read for negative tokens and memleaks on error. (cherry picked from commit 8370e426e4)
  apedec: set s->currentframeblocks after validating nblocks
  apedec: use unsigned int for 'nblocks' and make sure that it's within int range
  apedec: check for data buffer realloc failure (cherry picked from commit 11ca8b2d74)
  ...

Conflicts:
	Changelog
	Makefile
	RELEASE
	configure
	libavcodec/error_resilience.c
	libavcodec/mpegvideo.c
	libavformat/matroskaenc.c
	tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09 01:03:40 +01:00
doc Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
ffpresets Remove libx264 baseline ffpreset 2011-07-28 01:44:57 +02:00
libavcodec Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
libavdevice alsa: limit buffer_size to 32768 frames. 2011-09-26 19:26:29 +02:00
libavfilter Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
libavformat Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
libavutil Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
libpostproc postprocess.c: filter name needs to be double 0 terminated 2011-09-03 07:39:54 +02:00
libswscale Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
tools Revert "lavfi-showfiltfmts: extend output format for specifying audio data" 2011-08-05 13:10:24 +02:00
.gitignore Merge branch 'release/0.7' into oldabi 2011-09-22 04:34:43 +02:00
cmdutils.c Make all option parsing functions match the function pointer type through which they are called. 2011-09-07 08:56:04 +02:00
cmdutils.h Make all option parsing functions match the function pointer type through which they are called. 2011-09-07 08:56:04 +02:00
cmdutils_common_opts.h Make all option parsing functions match the function pointer type through which they are called. 2011-09-07 08:56:04 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-07-21 16:28:53 +02:00
configure Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01: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 branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
ffmpeg.c Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
ffplay.c Make all option parsing functions match the function pointer type through which they are called. 2011-09-07 08:56:04 +02:00
ffprobe.c Make all option parsing functions match the function pointer type through which they are called. 2011-09-07 08:56:04 +02:00
ffserver.c Make all option parsing functions match the function pointer type through which they are called. 2011-09-07 08:56:04 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE libaac+ support 2011-10-01 20:32:22 +02:00
MAINTAINERS Merge branch 'release/0.7' into oldabi 2011-11-09 01:03:40 +01:00
Makefile Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-10-01 22:42:41 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE update versions for 0.7 branch 2011-11-04 22:05:34 +01:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-31 00:34:47 +02:00
VERSION update versions for 0.7 branch 2011-11-04 22:05:34 +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.