FFmpeg git repo
Go to file
Michael Niedermayer f083b4c338 Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'
* commit 'e0f8be6413b6a8d334d6052e610af32935c310af':
  avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate

Conflicts:
	libavformat/ac3dec.c
	libavformat/avformat.h
	libavformat/avs.c
	libavformat/m4vdec.c
	libavformat/mov.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegvideodec.c
	libavformat/psxstr.c
	libavformat/pva.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 12:31:03 +02:00
compat
doc Merge commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a' 2013-05-05 10:47:19 +02:00
libavcodec Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487' 2013-05-05 11:34:29 +02:00
libavdevice Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7' 2013-05-04 10:17:52 +02:00
libavfilter Merge commit '093804a93cc5da3f95f98265a5df116912443cec' 2013-05-05 11:42:18 +02:00
libavformat Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af' 2013-05-05 12:31:03 +02:00
libavresample Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd' 2013-05-05 11:50:37 +02:00
libavutil lavu: add planar 16 bit and 8 bit rgb with alpha 2013-05-03 16:58:22 +00:00
libpostproc
libswresample
libswscale Avoid incorrect deprecated pixel format warning. 2013-05-05 10:01:22 +02:00
presets
tests Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07' 2013-05-05 10:36:23 +02:00
tools Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7' 2013-05-04 10:17:52 +02:00
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog extractplanes filter 2013-05-03 16:30:39 +00:00
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure configure: fix valgrind-memcheck arguments 2013-05-05 10:52:39 +02:00
ffmpeg.c ffmpeg: drop old non monotone dts workaround. 2013-05-03 15:04:47 +02:00
ffmpeg.h Merge remote-tracking branch 'qatar/master' 2013-05-03 14:52:03 +02:00
ffmpeg_filter.c Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a' 2013-05-01 17:24:43 +02:00
ffmpeg_opt.c Merge remote-tracking branch 'qatar/master' 2013-05-03 14:52:03 +02: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.