FFmpeg git repo
Go to file
Michael Niedermayer e28130bcaf Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4'
* commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4':
  dv: Split DV data table declarations into their own header

Conflicts:
	libavcodec/dvdata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-15 12:52:19 +01:00
compat
doc Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4' 2013-11-14 15:04:04 +01:00
libavcodec Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4' 2013-11-15 12:52:19 +01:00
libavdevice lavd/xv: free resources on errors 2013-11-15 09:56:58 +01:00
libavfilter af_aresample: Fix timestamp of first padded PCM audio packet 2013-11-15 11:54:02 +01:00
libavformat Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4' 2013-11-15 12:52:19 +01:00
libavresample
libavutil Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4' 2013-11-14 15:04:04 +01:00
libpostproc
libswresample
libswscale
presets
tests fate: Add VCR2 test 2013-11-14 08:49:31 +01:00
tools
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: Add 1.2 back to the maintained releases 2013-11-12 14:33:54 +01:00
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23' 2013-11-15 12:19:45 +01:00
configure Merge commit '16381923fb7b9087ce559fb1cd3594469ac6788b' 2013-11-14 02:34:34 +01:00
ffmpeg.c ffmpeg: remove unneeded include "libswscale/swscale.h" 2013-11-10 21:45:19 +01:00
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: fix overriding values set by -target 2013-11-13 22:07:19 +01:00
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.