FFmpeg git repo
Go to file
Michael Niedermayer 75ef907db8 Merge commit '6dfd99c93808d6504dd5cb1fad847d68cb179352'
* commit '6dfd99c93808d6504dd5cb1fad847d68cb179352':
  fate: add tests for SGI RLE and MVC1&2 decoders

Conflicts:
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 20:40:02 +02:00
compat
doc Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee' 2014-04-19 19:26:46 +02:00
libavcodec Merge commit '86a0432688216562926d4aee36118f01be6d5e1b' 2014-04-19 19:47:58 +02:00
libavdevice Merge remote-tracking branch 'lukaszmluki/master' 2014-04-18 04:57:23 +02:00
libavfilter Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f' 2014-04-19 18:30:37 +02:00
libavformat Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82' 2014-04-19 20:17:33 +02:00
libavresample Merge commit '21d8f4da91673051ad7055cf63d989488a56368e' 2014-04-17 21:07:25 +02:00
libavutil x86/float_dsp: remove duplicated code from vector_dmul_scalar 2014-04-19 14:21:51 +02:00
libpostproc
libswresample
libswscale Fix compilation with !HAVE_6REGS. 2014-04-19 09:56:01 +02:00
presets
tests Merge commit '6dfd99c93808d6504dd5cb1fad847d68cb179352' 2014-04-19 20:40:02 +02:00
tools
.gitignore
arch.mak
Changelog Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee' 2014-04-19 19:26:46 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '4936ef6492f640e1606c6507f2c4e495164d3974' 2014-04-19 13:39:32 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: fix mixed merged & split side data with the stream->packet hack 2014-04-18 01:01:38 +02:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
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.