No description
Find a file
Michael Niedermayer 5b0e2eb041 Merge commit 'f25e6e0c25' into release/2.2
* commit 'f25e6e0c25':
  RELEASE_NOTES: mention new filters

Conflicts:
	doc/RELEASE_NOTES

Not merged as these things where in past ffmpeg releases already.
    Or at least some of them where, volunteers to checks this and update
    our release notes are welcome

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23 20:29:23 +01:00
compat compat: provide va_copy for old gcc versions. 2013-12-30 12:38:03 +01:00
doc Merge commit '0f42e06651' into release/2.2 2014-03-23 03:12:28 +01:00
libavcodec Merge commit '230c4c6ad9' into release/2.2 2014-03-23 03:11:19 +01:00
libavdevice Add more Bayer colour spaces to the video4linux2 device wrapper. 2014-02-23 13:42:41 +01:00
libavfilter Merge commit '80239a8bb1' into release/2.2 2014-03-23 19:56:37 +01:00
libavformat Merge commit '29d61d73b1' into release/2.2 2014-03-23 04:05:56 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2014-02-22 21:12:02 +01:00
libavutil avutil/timestamp: Warn about missing __STDC_FORMAT_MACROS for C++ use 2014-03-15 02:42:11 +01:00
libpostproc postproc: fix null pointer dereference with invalid option strings 2013-12-11 22:28:42 +01:00
libswresample swr: check that the context for swr_convert() has been initialized 2014-02-24 08:23:42 +01:00
libswscale Add APIchanges entry and bump libswscale micro version for making gray16 full-scale. 2014-03-19 09:14:53 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests swscale/utils: Fix color range of gray16 2014-03-19 03:14:39 +01:00
tools Merge commit 'a6a2d8eb8f' into release/2.2 2014-03-03 22:42:25 +01:00
.gitignore gitignore: Add all examples below doc/examples 2014-03-02 11:42:37 -05:00
arch.mak Merge commit 'b326755989' 2012-12-08 14:24:16 +01:00
Changelog Autodetect VDA like all other hardware acccelerations. 2014-03-23 19:05:59 +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
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
common.mak Merge commit 'b339182eba' 2014-02-17 02:22:01 +01:00
configure Always pass the configure option sysroot to --sysroot and -isysroot. 2014-03-23 20:12:54 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg.c Merge commit '67f2a68814' 2014-02-24 21:08:19 +01:00
ffmpeg.h Merge commit '67f2a68814' 2014-02-24 21:08:19 +01:00
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
ffmpeg_opt.c ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams 2014-03-17 15:45:49 +01:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7' 2013-11-23 14:46:48 +01:00
ffplay.c Merge commit 'b36bc81cca' 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 'b339182eba' 2014-02-17 02:22:01 +01:00
LICENSE Revert "Add libx265 encoder" 2014-03-07 08:32:55 -05:00
MAINTAINERS update for 2.2 2014-03-01 03:34:59 +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 Release 2014-03-23 11:38:38 -04:00
VERSION update for 2.2-rc2 2014-03-15 03:08:20 +01: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.