Go to file
Michael Niedermayer da0f67b177 Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c'
* commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c':
  8bps: Bound-check the input buffer

Conflicts:
	libavcodec/8bps.c

See: 66ff90f4a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 11:45:54 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-19 11:08:38 +02:00
doc avcodec: add avcodec_chroma_pos_to_enum() 2013-07-23 03:11:28 +02:00
libavcodec Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c' 2013-07-24 11:45:54 +02:00
libavdevice avdevice/lavfi: fix input with unknown channel layout 2013-07-13 23:10:05 +02:00
libavfilter avfilter/avfiltergraph: minor cosmetic 2013-07-23 20:58:21 +02:00
libavformat avformat/http: support reading compressed data 2013-07-24 04:15:15 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
libavutil lavu/log: print prefix after \r. 2013-07-20 11:06:19 +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 swresample: fix negative rematrix volumns 2013-07-22 03:24:22 +02:00
libswscale libswscale: Adding RGB => XYZ support 2013-07-23 01:02:41 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests libswscale: Adding RGB => XYZ support 2013-07-23 01:02:41 +02:00
tools Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d' 2013-07-07 11:35:59 +02:00
.gitignore Rename ffadler to ffhash and expand it using the generic hash API 2013-05-16 17:58:56 +02:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog lavfi: port perspective filter from libmpcodecs 2013-07-14 16:27:17 +00:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
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 Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
configure Merge commit '7ef760d95c73dfee021b8fdee04f65126eb7edd1' 2013-07-22 10:34:48 +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 CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
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 ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffplay.c ffplay: improve error message in case of failure, mention filtergraph configuration 2013-07-21 19:20:46 +02:00
ffprobe.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffserver.c Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4' 2013-07-19 10:26:07 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
LICENSE lavfi: port perspective filter from libmpcodecs 2013-07-14 16:27:17 +00:00
MAINTAINERS MAINTAINERS: drop 1.1 from the releases that i maintain 2013-07-15 02:30:36 +02:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Update for 2.0 2013-07-10 02:15:43 +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.