FFmpeg git repo
Go to file
Michael Niedermayer c7d1717957 Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'
* commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8':
  avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo

Conflicts:
	doc/general.texi
	libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30 11:26:39 +02:00
compat
doc Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8' 2013-07-30 11:26:39 +02:00
libavcodec Merge commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e' 2013-07-30 09:50:26 +02:00
libavdevice
libavfilter Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8' 2013-07-30 11:26:39 +02:00
libavformat Merge commit '06205b5efdcf0bc4c5463bfdd02f09b5f79fc4cd' 2013-07-30 10:26:04 +02:00
libavresample
libavutil Merge commit 'd99a2b6d0a4d0b2f5ba6a1f1637d6cb88c5c9184' 2013-07-30 11:06:03 +02:00
libpostproc
libswresample
libswscale swscale/fill_rgb2yuv_table: fix default detection 2013-07-27 01:11:37 +02:00
presets
tests Merge commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7' 2013-07-30 11:13:34 +02:00
tools Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d' 2013-07-07 11:35:59 +02:00
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog lavfi: add compand filter 2013-07-29 19:11:50 +00:00
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge commit '4822ee3ca620a92cd2b0a9a03ea9e34288192c79' 2013-07-30 11:20:12 +02:00
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffprobe.c ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
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.