No description
Find a file
Michael Niedermayer af1fb1d467 Merge commit 'f8a72f041c' into release/1.1
* commit 'f8a72f041c':
  mpc8: Check the seek table size parsed from the bitstream
  zmbvdec: Check the buffer size for uncompressed data
  ape: Don't allow the seektable to be omitted
  shorten: Break out of loop looking for fmt chunk if none is found
  shorten: Use a checked bytestream reader for the wave header
  smacker: Make sure we don't fill in huffman codes out of range
  smacker: Avoid integer overflow when allocating packets
  smacker: Don't return packets in unallocated streams
  dsicin: Add some basic sanity checks for fields read from the file

Conflicts:
	libavcodec/shorten.c
	libavcodec/smacker.c
	libavcodec/zmbv.c
	libavformat/mpc8.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-08 00:24:54 +02:00
compat Merge commit '0c03cc6838' 2012-10-24 13:42:58 +02:00
doc update for 1.1.6 2013-08-31 04:55:35 +02:00
libavcodec Merge commit 'f8a72f041c' into release/1.1 2013-10-08 00:24:54 +02:00
libavdevice Read h264 headers from v4l2 to allow stream-copying. 2013-09-05 23:08:32 +02:00
libavfilter avfilter/vf_fps: make sure the fifo is not empty before using it 2013-09-07 12:54:40 +02:00
libavformat Merge commit 'f8a72f041c' into release/1.1 2013-10-08 00:24:54 +02:00
libavresample Merge remote-tracking branch 'qatar/release/9' into release/1.1 2013-02-05 16:28:36 +01:00
libavutil pixdesc: mark gray8 as pseudopal 2013-05-31 23:00:31 +02:00
libpostproc build: postproc cleanup. 2012-12-30 02:27:52 +01:00
libswresample swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output 2013-08-20 18:45:21 +02:00
libswscale Merge commit '1ab4578c88' into release/1.1 2013-05-12 14:31:59 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge remote-tracking branch 'jamrial/release/1.1' into release/1.1 2013-08-28 23:18:46 +02:00
tools Fix "knwon" typo and add a check in tools/patcheck 2013-01-04 19:24:37 +00:00
.gitignore Add examples/resampling_audio to .gitignore. 2012-12-06 12:13:01 +01:00
arch.mak Merge commit 'b326755989' 2012-12-08 14:24:16 +01:00
Changelog Merge remote-tracking branch 'qatar/release/9' into release/1.1 2013-09-09 09:10:20 +02:00
cmdutils.c Merge commit 'b7765d00f9' into release/1.1 2013-02-14 13:14:54 +01:00
cmdutils.h cmdutils: avtool -> fftool 2013-05-13 00:45:09 +02:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
configure Merge commit '05015d03da' into release/1.1 2013-05-12 12:49:36 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS
ffmpeg.c Merge commit 'fa6eef4210' into release/1.1 2013-08-27 16:30:57 +02:00
ffmpeg.h Merge commit '77bd1bc73a' 2012-12-20 02:38:02 +01:00
ffmpeg_filter.c ffmpeg: sub2video: set resample size. 2013-01-01 23:06:34 +01:00
ffmpeg_opt.c ffmpeg: dont allow -flags to override -pass 2013-02-06 02:03:05 +01:00
ffplay.c Replace references to "que" with the appropriate word. 2013-01-03 00:21:47 +01:00
ffprobe.c ffprobe: do not escape '"' between single quotes. 2013-01-01 13:32:51 +01:00
ffserver.c ffserver: add missing padding to extradata. 2012-12-30 22:22:18 +01:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
LICENSE lavfi: add histeq filter 2013-01-05 10:25:32 +01:00
MAINTAINERS MAINTAINERS: mention that people are welcome to pick up and maintain older releases 2013-03-18 03:35:47 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Prepare for 9.9 RELEASE 2013-09-08 08:12:07 +02:00
VERSION update for 1.1.6 2013-08-31 04:55:35 +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 in git.
  You can also view it online at http://ffmpeg.org/documentation.html

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

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.