Go to file
Michael Niedermayer 6e63867771 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libvorbis: Give consistent names to all functions, structs, and defines

Conflicts:
	libavcodec/libvorbisenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 13:56:53 +01:00
compat compat: provide va_copy for old gcc versions. 2013-12-30 12:38:03 +01:00
doc Merge commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1' 2014-02-20 02:01:13 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2014-02-21 13:56:53 +01:00
libavdevice Add decklink_enc.h to SKIPHEADERS. 2014-02-19 19:55:14 +01:00
libavfilter Merge remote-tracking branch 'cigaes/master' 2014-02-20 02:53:39 +01:00
libavformat avformat/movenc: assert that get_cluster_duration() value is valid 2014-02-21 04:41:21 +01:00
libavresample Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a' 2014-02-08 18:38:17 +01:00
libavutil Merge commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4' 2014-02-20 23:13:13 +01:00
libpostproc postproc: fix null pointer dereference with invalid option strings 2013-12-11 22:28:42 +01:00
libswresample Fix libswresample compilation with Apple Neon assembler. 2014-02-17 17:40:10 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2014-01-21 22:20:26 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests tiny_ssim: add per-frame metrics and final ssim db number. 2014-02-19 02:39:05 +01:00
tools tools/uncoded_frame: fix double free 2014-02-13 01:29:01 +01:00
.gitignore Merge commit '294a51e18ab7df4d658249361a03f0d716a4e9f0' 2014-02-19 14:33:22 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog lavfi: adding dejudder filter to remove judder produced by partially telecined material. 2014-02-16 17:43:58 +01:00
cmdutils_common_opts.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
cmdutils_opencl.c cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
cmdutils.c cmdutils: update copyright year to 2014. 2014-01-05 22:39:35 +02:00
cmdutils.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
common.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
configure Merge commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e' 2014-02-20 23:39:49 +01:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
ffmpeg_opt.c ffmpeg: support setting the chroma intra matrix 2014-02-18 18:19:28 +01:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c Merge commit '5c79d2e12d13959fc6aed92d102c25194a06de05' 2014-02-20 23:59:09 +01:00
ffmpeg.h ffmpeg: make reading packets from thread blocking. 2014-02-20 11:22:55 +01:00
ffplay.c Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d' 2014-02-10 13:26:31 +01:00
ffprobe.c ffprobe: check av_frame_alloc() failure. 2013-12-30 10:58:01 +01:00
ffserver.c ffserver: merge RTSP's teardown & pause routines 2014-02-14 14:31:42 -03:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
LICENSE Add libx265 encoder 2014-02-12 13:13:17 +00:00
MAINTAINERS MAINTAINERS: add myself as vf_dejudder.c maintainer 2014-02-17 03:13:55 +01:00
Makefile tools: add uncoded_frame test program. 2014-02-11 10:31:29 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Prepare for 10_beta1 Release 2014-02-15 16:49:04 -05:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01:00

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.