FFmpeg git repo
Go to file
Michael Niedermayer 0a8e86faf2 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Escape 130 FATE test

Conflicts:
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 11:06:39 +02:00
compat
doc Merge commit '8e673efc6f5b7a095557664660305148f2788d30' 2013-05-19 10:53:39 +02:00
libavcodec Merge commit 'ed50673066956d6f2201a57c3254569f2ab08d9d' 2013-05-19 10:38:08 +02:00
libavdevice Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110' 2013-05-16 09:56:43 +02:00
libavfilter avfilter/vf_deshake: check rx 2013-05-18 18:28:59 +02:00
libavformat ftp: favor strtoll over atoll 2013-05-19 10:02:44 +02:00
libavresample Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca' 2013-05-18 11:25:58 +02:00
libavutil Merge commit '40020e171a3549a2c0b65ce6f2649aec868872f2' 2013-05-18 11:17:52 +02:00
libpostproc
libswresample
libswscale sws/output: yuv2rgb_write() assert that alpha has the correct value in the tables 2013-05-18 15:14:19 +02:00
presets
tests Merge remote-tracking branch 'qatar/master' 2013-05-19 11:06:39 +02:00
tools tools/ffhash: Use O_BINARY when available 2013-05-17 00:38:07 +02:00
.gitignore Rename ffadler to ffhash and expand it using the generic hash API 2013-05-16 17:58:56 +02:00
arch.mak
Changelog FTP protocol support 2013-05-18 22:16:02 +02:00
cmdutils_common_opts.h
cmdutils.c Merge remote-tracking branch 'qatar/master' 2013-05-15 11:10:09 +02:00
cmdutils.h
common.mak
configure Merge commit '8e673efc6f5b7a095557664660305148f2788d30' 2013-05-19 10:53:39 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1' 2013-05-10 22:51:04 +02:00
ffmpeg_opt.c ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffmpeg.c ffmpeg: free threads on error conditions. 2013-05-15 01:28:59 +02:00
ffmpeg.h ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffplay.c Merge commit '26a44143efb513a602542fb59aee87b1fc62af51' 2013-04-28 12:03:41 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE lavfi: port wavelet denoiser filter from libmpcodecs. 2013-05-16 00:45:45 +02:00
MAINTAINERS FTP protocol support 2013-05-18 22:16:02 +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.