FFmpeg git repo
Go to file
Michael Niedermayer 9818bbde53 Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'
* commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe':
  nut: use meaningful error values
  FATE: use a less ambiguous end time for filter-trim-time test

Conflicts:
	libavformat/nutdec.c
	tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 12:47:54 +02:00
compat
doc Merge commit '481575d255195c6c2f32e04686b94de984ae78d4' 2013-05-08 12:07:56 +02:00
libavcodec Merge commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8' 2013-05-08 11:54:29 +02:00
libavdevice
libavfilter lavfi/unsharp: use verbal form in help message options 2013-05-08 01:39:12 +02:00
libavformat Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe' 2013-05-08 12:47:54 +02:00
libavresample Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd' 2013-05-05 11:50:37 +02:00
libavutil lavu/mem: fix potential int overflow and crash in av_dynarray_add() 2013-05-08 01:39:12 +02:00
libpostproc
libswresample
libswscale sws: factorize rgb 9+ planar funcs declarations. 2013-05-07 15:23:27 +02:00
presets
tests Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe' 2013-05-08 12:47:54 +02:00
tools
.gitignore
arch.mak
Changelog avconv: remove -deinterlace 2013-05-07 12:31:55 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure configure: use shorter variable name for "libavdevice_pc_deps" 2013-05-08 12:38:01 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: move a local variable definition later. 2013-05-07 18:39:45 +02:00
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
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.