FFmpeg git repo
Go to file
Michael Niedermayer 7b6c0bda9e Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'
* commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb':
  avconv: update to the new options syntax.

Conflicts:
	ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:19:32 +02:00
compat
doc Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da' 2013-04-12 15:08:40 +02:00
libavcodec avcodec: rename prores encoders 2013-04-11 23:13:34 +02:00
libavdevice buffersink: switch from opaque to AVOptions for params 2013-04-12 13:47:40 +02:00
libavfilter Merge commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee' 2013-04-12 15:14:08 +02:00
libavformat Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795' 2013-04-11 21:50:53 +02:00
libavresample
libavutil lavu: add helper functions for integer lists. 2013-04-12 12:09:51 +02:00
libpostproc
libswresample
libswscale
presets
tests avcodec: rename prores encoders 2013-04-11 23:13:34 +02:00
tools Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' 2013-04-11 23:50:39 +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 Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da' 2013-04-12 15:08:40 +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 Merge commit '93e65e9a6c0895f869752a66731d9b2ec3916467' 2013-04-11 22:22:06 +02:00
ffmpeg.c Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da' 2013-04-12 15:08:40 +02:00
ffmpeg.h Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' 2013-04-11 23:50:39 +02:00
ffmpeg_filter.c Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb' 2013-04-12 15:19:32 +02:00
ffmpeg_opt.c Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' 2013-04-11 23:50:39 +02:00
ffplay.c Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da' 2013-04-12 15:08:40 +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.