ffmpeg

Go to file

Michael Niedermayer 29df24252a Merge commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3' into release/2.2

* commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3':
  doc: Add section about AviSynth support

Conflicts:
	doc/general.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-03-15 02:40:44 +01:00

compat

compat: provide va_copy for old gcc versions.

2013-12-30 12:38:03 +01:00

doc

Merge commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3' into release/2.2

2014-03-15 02:40:44 +01:00

libavcodec

Merge commit '6d7ab09788bdafffb3f3fc4f7feb262eb8cdf0b1' into release/2.2

2014-03-11 12:16:27 +01:00

libavdevice

Add more Bayer colour spaces to the video4linux2 device wrapper.

2014-02-23 13:42:41 +01:00

libavfilter

Merge commit '227cfc1f10a940c88ad3742ec805c07b6a5e7abb' into release/2.2

2014-03-11 12:16:05 +01:00

libavformat

Merge commit '6d56bc9a6d853a33fe53ab63db580c4facaba420' into release/2.2

2014-03-11 13:13:42 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2014-02-22 21:12:02 +01:00

libavutil

Merge commit '45acc228a6d5f1e7d6c5ce6da63b293bd5eda57d' into release/2.2

2014-03-11 12:09:13 +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

libswscale: bayer to rgb24 & yv12 colorspace converters

2014-02-23 02:38:22 +01:00

presets

presets: specify the codecs.

2012-05-04 18:40:36 +02:00

tests

Update default FATE URL for release/10

2014-03-07 08:32:55 -05:00

tools

Merge commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35' 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 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

Changelog

changelog: Cleanups and prepare for v10_beta2

2014-03-08 20:50:36 -05: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 '4b476e6aa4b830f919cf3c67ba2caa039ff285b9' into release/2.2

2014-03-11 10:32:26 +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_filter.c

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

ffmpeg_opt.c

ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check

2014-02-25 00:05:37 +01:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

2013-11-23 14:46:48 +01:00

ffmpeg.c

Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

2014-02-24 21:08:19 +01:00

ffmpeg.h

Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

2014-02-24 21:08:19 +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

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_beta2 Release

2014-03-02 11:42:36 -05:00

VERSION

Update for 2.2-rc1

2014-03-01 04:03:08 +01:00

version.sh

version.sh: add preprocessing guards

2013-11-30 21:42:03 +01:00

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.

Languages

C 92.1%

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%