FFmpeg git repo
Go to file
Michael Niedermayer 62094e2fdd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: add Alias PIX tests

Conflicts:
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 01:59:32 +01:00
compat
doc Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b' 2014-03-27 01:10:28 +01:00
libavcodec Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b' 2014-03-27 01:10:28 +01:00
libavdevice dshow: log error and continue if unable to set audio buffer 2014-03-25 17:32:39 +01:00
libavfilter avfilter/vf_pullup: add comment to explain memset(0) 2014-03-26 20:05:57 +01:00
libavformat Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b' 2014-03-27 01:10:28 +01:00
libavresample Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f' 2014-03-26 14:50:55 +01:00
libavutil avutil/frame: undeprecate AVFrame.motion_val API 2014-03-26 18:22:49 +01:00
libpostproc
libswresample swresample/resample: sse float linear interpolation 2014-03-24 02:34:02 +01:00
libswscale Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f' 2014-03-26 14:50:55 +01:00
presets
tests Merge remote-tracking branch 'qatar/master' 2014-03-27 01:59:32 +01:00
tools
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b' 2014-03-27 01:10:28 +01:00
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
cmdutils_opencl.c
common.mak
configure Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834' 2014-03-24 20:55:23 +01:00
ffmpeg.c Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc' 2014-03-25 19:25:10 +01:00
ffmpeg.h Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e' 2014-03-24 16:40:35 +01:00
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
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.