Go to file
Michael Niedermayer dd0429e1de Merge commit '756547ce7f4d67a18663503e2157aebed3531703'
* commit '756547ce7f4d67a18663503e2157aebed3531703':
  avi: DV in AVI must be considered single stream

Conflicts:
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 11:22:28 +02:00
compat
doc doc/filters: remove extra spacing in vid.stab section. 2013-10-09 13:22:04 +02:00
libavcodec Merge commit '1018a92219a38a812cf97761c6b3a5e66a400f4b' 2013-10-10 10:32:04 +02:00
libavdevice lavd/xv.c: Include XShm.h before Xvlib.h. 2013-10-09 19:01:11 +02:00
libavfilter avfilter/buffersink: try to fix AV_NOPTS_VALUE 2013-10-09 16:33:18 +02:00
libavformat Merge commit '756547ce7f4d67a18663503e2157aebed3531703' 2013-10-10 11:22:28 +02:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2013-10-09 14:29:42 +02:00
libpostproc
libswresample x86: Fix compilation with nasm on PPC & OS/2 2013-10-08 12:36:19 +02:00
libswscale
presets
tests
tools
.gitignore
arch.mak
Changelog lavd: pulse audio encoder 2013-10-08 14:31:50 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1' 2013-10-09 14:17:56 +02: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
ffserver.c ffserver: strip odd chars from html error messages before sending them back 2013-10-09 00:30:46 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add Communication section 2013-10-09 04:04:38 +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.