FFmpeg git repo
Go to file
Michael Niedermayer ef7e8efc6b Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'
* commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4':
  lavf: Avoid setting avg_frame_rate if delta_dts is negative

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:19:13 +02:00
compat
doc doc/filters: add [] labels for the graph of the opening paragraph example 2013-09-23 00:11:56 +02:00
libavcodec Merge commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd' 2013-09-23 14:03:53 +02:00
libavdevice avdevice/v4l: remove duplicate include 2013-09-21 15:36:33 +02:00
libavfilter avfilter: add ladspa wrapper filter 2013-09-22 16:36:10 +00:00
libavformat Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4' 2013-09-23 14:19:13 +02:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2013-09-22 11:51:38 +02:00
libpostproc
libswresample
libswscale
presets
tests Merge commit 'f1eac2b8a0370b908cd691086d11f51342054730' 2013-09-23 13:09:53 +02:00
tools tools: Fix apparent merge failure 2013-09-21 14:40:31 +02:00
.gitignore
arch.mak
Changelog avfilter: add ladspa wrapper filter 2013-09-22 16:36:10 +00:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure avfilter: add ladspa wrapper filter 2013-09-22 16:36:10 +00:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: fix uninitialized variable warning 2013-09-23 14:16:34 +02:00
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS lavf/libssh: add MAINTAINERS entry 2013-09-21 16:35:41 +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.