FFmpeg git repo
Go to file
Michael Niedermayer 647fe2e777 Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795'
* commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795':
  img2enc: add an option for overwriting one file with subsequent images

Conflicts:
	doc/muxers.texi
	libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 21:50:53 +02:00
compat
doc Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795' 2013-04-11 21:50:53 +02:00
libavcodec libshine fixed point MP3 encoding support 2013-04-11 14:27:59 +00:00
libavdevice
libavfilter lavfi/flite: switch to AVOption-based system 2013-04-11 21:37:48 +02:00
libavformat Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795' 2013-04-11 21:50:53 +02:00
libavresample
libavutil opencl: add spec opencl device APIs 20130411 2013-04-11 12:46:34 +02:00
libpostproc lavfi/pp: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
libswresample
libswscale Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
presets
tests lavfi/aevalsrc: switch to an AVOptions-based system. 2013-04-11 17:28:02 +02:00
tools Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog telecine filter 2013-04-11 11:12:39 +00:00
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: add opencl maintainer 2013-04-11 13:42:07 +02:00
Makefile
README
RELEASE
arch.mak
cmdutils.c cmdutils: add opencl command line options to ffmpeg 2013-04-11 16:05:19 +02:00
cmdutils.h cmdutils: remove unneeded #if 2013-04-11 16:07:11 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
common.mak
configure Fix compilation with --disable-everything --enable-filter=deshake 2013-04-11 16:33:02 +02:00
ffmpeg.c ffmpeg: update error message, and make use of av_err2str() to simplify 2013-04-10 18:02:00 +02:00
ffmpeg.h ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
ffmpeg_filter.c ffmpeg: insert format filter with the appropriate separator. 2013-04-11 18:05:46 +02:00
ffmpeg_opt.c ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
ffplay.c ffplay: simplify video pts calculation 2013-04-08 22:21:45 +02:00
ffprobe.c
ffserver.c
library.mak
version.sh

README

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.