Go to file
Michael Niedermayer 4818388e6c Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'
* commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a':
  avconv: make output -ss insert trim/atrim filters.

Conflicts:
	Changelog
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 17:24:43 +02:00
compat
doc Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876' 2013-05-01 11:34:34 +02:00
libavcodec Merge commit 'e036bb7899d0faca9159206be9bf5552e76e7633' 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 avfilter/trim: improve rounding precission 2013-05-01 13:55:30 +02:00
libavformat framecrcenc: workaround design flaw in sidedata palette 2013-04-30 13:35:14 +02:00
libavresample
libavutil avutil/log: Fix context pointer used for get_category() 2013-04-30 20:06:24 +02:00
libpostproc
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
tests fate/pixfmts: use the appropriate variable names for temporary files. 2013-05-01 13:25:42 +02:00
tools ismindex: check mkdir()s return code 2013-04-21 19:53:18 +02:00
.gitignore
arch.mak
Changelog Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a' 2013-05-01 17:24:43 +02:00
cmdutils_common_opts.h
cmdutils.c lavfi: add timeline support. 2013-04-23 01:02:27 +02:00
cmdutils.h Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6' 2013-04-12 15:56:20 +02:00
common.mak
configure lavu/opencl: add check version and platform 2013-04-28 23:42:58 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a' 2013-05-01 17:24:43 +02:00
ffmpeg_opt.c Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117' 2013-05-01 12:09:07 +02:00
ffmpeg.c Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a' 2013-05-01 17:24:43 +02:00
ffmpeg.h
ffplay.c Merge commit '26a44143efb513a602542fb59aee87b1fc62af51' 2013-04-28 12:03:41 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak
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
README
RELEASE
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.