Go to file
Michael Niedermayer e9348e107b Merge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446'
* commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446':
  mlpdec: Do not set invalid context in read_restart_header

Conflicts:
	libavcodec/mlpdec.c

See: a9cd12ee2a

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 13:28:40 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-05 13:11:06 +02:00
doc lavf/segment: add initial_offset option 2013-07-11 00:36:24 +02:00
libavcodec Merge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446' 2013-07-12 13:28:40 +02:00
libavdevice lavd/fbdev.c: Support RGB565 input colour space. 2013-07-11 18:16:07 +02:00
libavfilter lavfi/aevalsrc: do not free AVOption variables in uninit() 2013-07-10 19:22:07 +00:00
libavformat rmdec: fix crash in case of oom 2013-07-12 04:24:35 +02:00
libavresample
libavutil Merge commit 'ef5b70affc6376bfeadd1ff649b79bad9a124fa8' 2013-07-12 12:07:14 +02:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample cosmetics: Fix "dont" "wont" "doesnt" typos 2013-06-29 02:31:16 +02:00
libswscale swscale: treat gray as a fullrage (0-255) format 2013-07-08 15:21:48 +02:00
presets
tests fate: Always enable avresample 2013-07-10 15:12:05 -04:00
tools Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d' 2013-07-07 11:35:59 +02:00
.gitignore
arch.mak
Changelog lavfi: add aecho filter 2013-07-10 12:10:58 +00:00
cmdutils_common_opts.h
cmdutils.c cmdutils: replace exit() by exit_program() 2013-07-08 11:12:32 +02:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
common.mak
configure Merge commit 'ef5b70affc6376bfeadd1ff649b79bad9a124fa8' 2013-07-12 12:07:14 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg_filter: replace exit() by exit_program() 2013-07-08 11:09:22 +02:00
ffmpeg_opt.c ffmpeg_opt: do not warn about unused gop_timecode 2013-07-09 10:54:40 +02:00
ffmpeg.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffmpeg.h
ffplay.c ffplay: assume 0 stream start time if start time is unset in duration check 2013-07-09 20:19:54 +02:00
ffprobe.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffserver.c
INSTALL
library.mak
LICENSE lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
MAINTAINERS MAINTAINERS: Update which releases are supported 2013-07-10 00:47:01 +02:00
Makefile
README
RELEASE Update for 2.0 2013-07-10 02:15:43 +02:00
version.sh

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.