FFmpeg git repo
Go to file
Michael Niedermayer b69b075ac6 Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508'
* commit '545a0b807cf45b2bbc4c9087a297b741ce00f508':
  vf_fps: add 'start_time' option

Conflicts:
	doc/filters.texi
	libavfilter/vf_fps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-21 11:37:10 +02:00
compat avisynth: Support video input from AviSynth 2.5 properly. 2013-08-17 14:27:25 +02:00
doc Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508' 2013-08-21 11:37:10 +02:00
libavcodec Merge commit '2a61592573d725956a4377641344afe263382648' 2013-08-21 11:18:43 +02:00
libavdevice
libavfilter Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508' 2013-08-21 11:37:10 +02:00
libavformat Merge commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb' 2013-08-21 11:00:26 +02:00
libavresample
libavutil
libpostproc
libswresample swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output 2013-08-20 16:56:51 +02:00
libswscale swscale: improve dither checks 2013-08-19 18:33:50 +02:00
presets
tests fate: Add EXIF test. 2013-08-20 18:47:20 +02:00
tools
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Revert "Merge commit of 'vdpau: remove old-style decoders'" 2013-08-17 22:17:49 +02:00
ffmpeg.c Warn the user if a pix_fmt != yuv420p was chosen for MPEG-2 video encoding. 2013-08-18 22:00:35 +02:00
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
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.