No description
Find a file
Michael Niedermayer a3d331f2d8 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
* qatar/release/0.7: (96 commits)
  intfloat_readwrite: fix signed addition overflows
  smacker: validate channels and sample format.
  smacker: check buffer size before reading output size
  smacker: validate number of channels
  sipr: fix get_bits(0) calls
  motion_est: make MotionExtContext.map_generation unsigned
  4xm: prevent NULL dereference with invalid huffman table
  4xmdemux: prevent use of uninitialized memory
  4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
  ptx: check for out of bound reads
  tiffdec: fix out of bound reads/writes
  eacmv: check for out of bound reads
  eacmv: fix potential pointer arithmetic overflows
  adpcm: fix out of bound reads due to integer overflow
  anm: prevent infinite loop
  avsdemux: check for out of bound writes
  avs: check for out of bound reads
  avsdemux: check for corrupted data
  mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
  vaapi: Fix VC-1 decoding (reconstruct bitstream TTFRM correctly).
  ...

Conflicts:
	libavcodec/adpcm.c
	libavcodec/bink.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/motion_est_template.c
	libavcodec/mpegvideo.c
	libavcodec/nellymoserdec.c
	libavcodec/ptx.c
	libavcodec/svq3.c
	libavcodec/vaapi_vc1.c
	libavcodec/xan.c
	libavfilter/vf_scale.c
	libavformat/4xm.c
	libavformat/flvdec.c
	libavformat/mpeg.c
	tests/ref/fate/motionpixels

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-19 05:14:44 +01:00
doc Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2012-03-19 05:14:44 +01:00
ffpresets presets: forgotten libvpx presets 2011-06-21 17:52:16 +02:00
libavcodec Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2012-03-19 05:14:44 +01:00
libavdevice v4l2: fix uninitialized variable 2011-11-18 21:05:12 +01:00
libavfilter Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2012-03-19 05:14:44 +01:00
libavformat Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2012-03-19 05:14:44 +01:00
libavutil Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2012-03-19 05:14:44 +01:00
libpostproc postprocess: Remove test for impossible condition (was: Re: postprocess.c: replace check for p==NULL with *p==0) 2011-06-02 14:43:14 +02:00
libswscale Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2012-01-12 20:55:46 +01:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2012-03-19 05:14:44 +01:00
tools showfiltfmts: use av_get_pix_fmt_name() 2011-06-07 12:44:51 +02:00
.gitignore gitignore: ignore .exp files, as generated by the MS linker on win32 2011-09-21 18:04:31 +02:00
Changelog Update Changelog for 0.7.4 release 2012-01-11 11:40:38 +01: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-06-15 02:15:25 +02:00
configure configure: fix arch x86_32 2011-11-04 13:33:33 +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 Update for 0.8.10 2012-01-12 22:25:00 +01:00
ffmpeg.c ffmpeg: increase bit_buffer_size, the header size is clearly too small for rgb48 raw based formats 2011-10-01 20:27:48 +02:00
ffplay.c ffplay: limit lowres to the maximum supported. Fixes Ticket591 2011-11-18 21:05:12 +01:00
ffprobe.c lavc: introduce avcodec_open2() as a replacement for avcodec_open(). 2011-11-19 10:22:26 +01:00
ffserver.c Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2012-01-08 06:53:38 +01:00
ffserver.h multiple inclusion guard cleanup 2011-05-21 13:48:10 +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 MAINTAINERS: new ffplay maintainer 2011-11-04 00:40:43 +01:00
Makefile Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-10-01 22:42:41 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE Update for 0.8.10 2012-01-12 22:25:00 +01:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
VERSION Update for 0.8.10 2012-01-12 22:25:00 +01:00
version.sh Merge remote-tracking branch 'qatar/master' 2011-06-20 04:07:34 +02:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.