ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-11 09:20:01 +01:00

Go to file

Michael Niedermayer 7c81afdba5 Merge commit '40dd29653ab85812d21fa64e9a665ceb316701ad' into release/2.2

* commit '40dd29653ab85812d21fa64e9a665ceb316701ad':
  Prepare for 10.2 Release
  Update Changelog for v10.2

Conflicts:
	Changelog
	RELEASE

Not merged as these dont align with our releases

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

2014-07-14 22:57:48 +02:00

compat

Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA'

2014-05-31 12:18:31 +02:00

doc

update for FFmpeg 2.2.4

2014-06-23 15:56:15 +02:00

libavcodec

Merge commit '4ec1acc6e4f4d0bd28617bbb30ebfb779ce7df92' into release/2.2

2014-07-14 22:39:25 +02:00

libavdevice

lavd/opengl_enc: fix pixel data alignment

2014-05-05 00:09:17 +02:00

libavfilter

Merge commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3' into release/2.2

2014-05-11 17:10:07 +02:00

libavformat

Merge commit '46c477c2a14b04a63ab11d31003b48fab6146a96' into release/2.2

2014-07-14 22:26:06 +02:00

libavresample

Merge commit '9d02e38d3f03100784348ff75fd181d2aaad7e43' into release/2.2

2014-05-04 20:14:18 +02:00

libavutil

Merge commit '6d899d0206e91a3a74680b47ec06ef1dbc151c21' into release/2.2

2014-07-14 22:24:36 +02:00

libpostproc

postproc: fix null pointer dereference with invalid option strings

2013-12-11 22:28:42 +01:00

libswresample

swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input

2014-04-24 08:59:56 +02:00

libswscale

Merge commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092' into release/2.2

2014-05-11 16:44:08 +02:00

presets

…

tests

iavcodec/vc1dec: Fix missing {}

2014-05-05 00:09:17 +02:00

tools

Merge commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35' into release/2.2

2014-03-03 22:42:25 +01:00

.gitignore

Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

2014-02-25 20:26:00 +01:00

arch.mak

…

Changelog

Merge commit '40dd29653ab85812d21fa64e9a665ceb316701ad' into release/2.2

2014-07-14 22:57:48 +02: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

Improve the detection of architecture x86.

2014-05-31 12:14:48 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

ffmpeg_filter: fix pointer to local outside scope

2014-05-05 00:09:17 +02: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 '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffmpeg.c

Merge commit '6672f672d98cf4887e13321b6f67682cfd1273b4' into release/2.2

2014-06-20 00:06:36 +02: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: fix crash happening because of new streams occuring

2014-05-21 22:53:49 +02:00

ffserver.c

ffserver: merge RTSP's teardown & pause routines

2014-02-14 14:31:42 -03:00

INSTALL

…

library.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

2014-02-17 02:22:01 +01:00

LICENSE

Add libx265 encoder

2014-02-12 13:12:22 +00: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

…

RELEASE

Prepare for 10.2 Release

2014-06-26 21:14:55 -04:00

VERSION

update for FFmpeg 2.2.4

2014-06-23 15:56:15 +02: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 89.9%

Assembly 8.1%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%