No description
Find a file
Michael Niedermayer 0061ba044a Merge commit '2548834b22'
* commit '2548834b22':
  vf_setpts: cosmetics, reformat

Conflicts:
	libavfilter/f_setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:24:45 +02:00
compat Provide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/. 2013-03-21 04:23:24 +01:00
doc doc/filters: fix scale example equivalence. 2013-05-01 04:46:14 +02:00
libavcodec Merge commit 'e036bb7899' 2013-05-01 10:00:08 +02:00
libavdevice avdevice/lavfi: add error checking for av_opt_set_int_list() 2013-04-12 20:39:07 +02:00
libavfilter Merge commit '2548834b22' 2013-05-01 10:24:45 +02:00
libavformat framecrcenc: workaround design flaw in sidedata palette 2013-04-30 13:35:14 +02:00
libavresample Merge commit 'b6649ab503' 2013-03-28 11:20:41 +01:00
libavutil avutil/log: Fix context pointer used for get_category() 2013-04-30 20:06:24 +02:00
libpostproc lavfi/pp: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
libswresample swr/rematrix: use av_calloc() 2013-04-15 20:31:06 +02:00
libswscale sws: fix typo in xyz2rgb matrix use. 2013-04-28 19:57:45 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit 'e036bb7899' 2013-05-01 10:00:08 +02:00
tools ismindex: check mkdir()s return code 2013-04-21 19:53:18 +02:00
.gitignore Merge commit 'a862c7d336' 2013-04-06 13:23:38 +02:00
arch.mak Merge commit 'b326755989' 2012-12-08 14:24:16 +01:00
Changelog astats filter 2013-04-27 12:40:34 +00:00
cmdutils.c lavfi: add timeline support. 2013-04-23 01:02:27 +02:00
cmdutils.h Merge commit 'e19e8aeeaa' 2013-04-12 15:56:20 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
common.mak Merge commit '472391b9a7' 2013-03-28 12:12:38 +01:00
configure lavu/opencl: add check version and platform 2013-04-28 23:42:58 +02: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 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 CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg.c ffmpeg: make -aspect work with -vcodec copy. 2013-04-18 22:59:54 +02:00
ffmpeg.h Merge commit '38f0c0781a' 2013-04-11 23:50:39 +02:00
ffmpeg_filter.c ffmpeg_filter: fix leak on error 2013-04-21 11:59:34 +02:00
ffmpeg_opt.c ffmpeg: make -aspect work with -vcodec copy. 2013-04-18 22:59:54 +02:00
ffplay.c Merge commit '26a44143ef' 2013-04-28 12:03:41 +02:00
ffprobe.c ffprobe: set writer context to 0 after allocation 2013-03-19 18:00:34 +01:00
ffserver.c ffserver/ctime1: avoid using strcpy() 2013-03-25 23:31:34 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '472391b9a7' 2013-03-28 12:12:38 +01:00
LICENSE lavfi: add video stabilization plugins using vid.stab library 2013-04-24 18:30:42 +02:00
MAINTAINERS MAINTAINERS: add jpeg2000 maintainer 2013-04-24 16:42:47 +02:00
Makefile Merge commit 'a862c7d336' 2013-04-06 13:23:38 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01: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.