FFmpeg git repo
Go to file
Michael Niedermayer be2c0adc96 Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'
* commit '69f086e0f90f23d89e5739b099a4f984fa6a7885':
  build: avfilter: Remove duplicate compilation entry for vf_scale

Conflicts:
	libavfilter/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 17:39:03 +01:00
compat
doc Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
libavcodec Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
libavdevice
libavfilter Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885' 2012-12-21 17:39:03 +01:00
libavformat Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
libavresample Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-12-20 02:51:35 +01:00
libpostproc
libswresample
libswscale Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
presets
tests Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
tools Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge commit 'acb571c89a065d943163c11efb46de35774f1909' 2012-12-20 02:44:22 +01:00
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011' 2012-12-20 12:06:15 +01:00
cmdutils.h Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011' 2012-12-20 12:06:15 +01:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
common.mak
configure Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: fix recording time in->out carryover. 2012-12-20 17:45:43 +01:00
ffplay.c ffplay: fix handling of resolution changes with h264-mt 2012-12-21 00:50:47 +01: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.