No description
Find a file
Michael Niedermayer 465742bbbe Merge commit '5c54fc6195' into release/1.1
* commit '5c54fc6195':
  Prepare for 9.8 RELEASE
  update Changelog
  smacker: check frame size validity
  smacker: pad the extradata allocation
  smacker: check the return value of smacker_decode_tree
  smacker: fix an off by one in huff.length computation
  4xm: do not overread the prestream buffer
  4xm: validate the buffer size before parsing it
  4xm: reject frames not compatible with the declared version
  4xm: drop pointless assert
  4xm: forward errors from decode_p_block
  4xm: fold last_picture lazy allocation in decode_p_frame
  4xm: do not overread while parsing header
  4xm: refactor fourxm_read_header
  4xm: K&R formatting cosmetics
  4xm: use the correct logging context

Conflicts:
	Changelog
	RELEASE
	libavcodec/4xm.c
	libavcodec/smacker.c
	libavformat/4xm.c
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-27 15:42:14 +02:00
compat Merge commit '0c03cc6838' 2012-10-24 13:42:58 +02:00
doc update all trac links to use the trac subdomain 2013-07-15 02:34:35 +02:00
libavcodec Merge commit '5c54fc6195' into release/1.1 2013-08-27 15:42:14 +02:00
libavdevice avdevice/x11grab: allocate just one Cursor 2013-06-21 17:19:00 +02:00
libavfilter src_movie: fix scanf string 2013-05-13 00:35:04 +02:00
libavformat Merge commit '5c54fc6195' into release/1.1 2013-08-27 15:42:14 +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 fate: fetch samples that match the release series 2013-03-23 14:45:01 +01: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 commit '5c54fc6195' into release/1.1 2013-08-27 15:42:14 +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 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01: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
ffmpeg.c ffmpeg: free threads on error conditions. 2013-05-17 23:23: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 Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
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.8 RELEASE 2013-06-30 16:03:27 +02:00
VERSION Update for 1.1.5 2013-05-13 00:59:36 +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.