mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00

Go to file

Clément Bœsch 1080b7162f Merge commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b'

* commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b':
  vmnc: check that subrectangles fit into their containing rectangles

See 6ba02602aa7fc7d38db582e75b8b093fb3c1608d

This merge keeps our condition against w-i and h-j instead of bw and bh.
One may be more correct than the other, but I'm keeping our behaviour
here for safety reasons.

The style and formatting is merged.

Merged-by: Clément Bœsch <u@pkh.me>

2017-03-19 17:24:49 +01:00

compat

compat/atomics/gcc: use __typeof__ instead of typeof

2017-03-18 12:13:46 -03:00

doc

lavfi: deprecate AVFilterGraph->resample_lavr_opts

2017-03-18 07:37:35 +00:00

libavcodec

Merge commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b'

2017-03-19 17:24:49 +01:00

libavdevice

Merge commit '93fed46a92bab8be176d3e67be4354189a8dbe7f'

2017-03-19 16:08:27 +01:00

libavfilter

lavfi: deprecate AVFilterGraph->resample_lavr_opts

2017-03-18 07:37:35 +00:00

libavformat

Merge commit 'be3363f664d7314d55b42860bd4077154752d769'

2017-03-19 16:04:46 +01:00

libavresample

Bump minor versions after 3.2 branchpoint to seperate release

2016-10-26 20:52:42 +02:00

libavutil

lavu/mathematics: split closing bracket out of ifdefery

2017-03-18 23:50:05 +01:00

libpostproc

Bump minor versions after 3.2 branchpoint to seperate release

2016-10-26 20:52:42 +02:00

libswresample

swresample/x86/resample: extend resample_double to support avx and fma3

2017-03-19 12:24:41 +07:00

libswscale

Merge commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e'

2017-03-19 15:40:03 +01:00

presets

presets: remove moldering iPod presets

2014-06-17 16:15:04 -08:00

tests

fate: Do not report side data size

2017-03-17 13:12:25 -04:00

tools

tools/target_dec_fuzzer: Fix misaligned read

2017-02-24 14:12:13 +01:00

.gitattributes

fate: add SCC test

2017-01-27 17:06:42 +01:00

.gitignore

Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1'

2016-06-26 15:43:05 +02:00

.travis.yml

Merge commit 'eda183287489b2c705843aa373a19c4e46fb2fec'

2015-11-22 17:12:24 +00:00

arch.mak

mips: rename mipsdspr1 to mipsdsp

2015-12-04 02:35:42 +01:00

Changelog

Merge commit '4fef648d10bf3bcfd4b8fa5755c1128966a2427c'

2017-03-15 22:07:47 +01:00

cmdutils_common_opts.h

cmdutils: add show_demuxers and show_muxers

2016-11-08 01:56:31 +01:00

cmdutils_opencl.c

cmdutils_opencl: fix resource_leak cid 1396852

2017-01-13 07:54:49 +08:00

cmdutils.c

cmdutils: remove duplicate windows.h include

2016-11-16 15:06:16 +01:00

cmdutils.h

cmdutils: add show_demuxers and show_muxers

2016-11-08 01:56:31 +01:00

common.mak

Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1'

2016-06-27 19:39:46 +02:00

configure

configure: clang -Oz for small size build to reduce size further

2017-03-16 20:58:52 +01:00

CONTRIBUTING.md

Add CONTRIBUTING.md

2016-09-18 10:02:13 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_cuvid.c

ffmpeg_cuvid: adapt for recent filter graph initialization changes

2017-03-03 08:45:43 +01:00

ffmpeg_dxva2.c

Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28'

2016-06-26 15:34:01 +02:00

ffmpeg_filter.c

ffmpeg: don't use resample_lavr_opts

2017-03-16 06:58:50 +00:00

ffmpeg_opt.c

ffmpeg, ffprobe: don't "merge" side data into packet data by default

2017-03-14 23:37:28 +01:00

ffmpeg_qsv.c

ffmpeg: init filtergraphs only after we have a frame on each input

2017-03-03 08:45:43 +01:00

ffmpeg_vaapi.c

ffmpeg_vaapi: Always set hwaccel_ctx, so it gets properly cleaned up on error

2017-02-05 15:13:15 +00:00

ffmpeg_vdpau.c

Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6'

2016-06-26 15:29:39 +02:00

ffmpeg_videotoolbox.c

ffmpeg/videotoolbox: protect UTGetOSTypeFromString on both VDA and VT

2015-10-15 10:22:31 +02:00

ffmpeg.c

ffmpeg: set the encoding framerate when the output is CFR

2017-03-17 11:54:38 +01:00

ffmpeg.h

Merge commit 'b0f36a0043d76436cc7ab8ff92ab99c94595d3c0'

2017-03-12 13:08:04 +01:00

ffplay.c

ffplay: change keyboard volume control to logarithmic

2017-02-08 22:36:42 +01:00

ffprobe.c

fate: Do not report side data size

2017-03-17 13:12:25 -04:00

ffserver_config.c

ffserver_config: Check for failure to allocate FFServerIPAddressACL

2016-12-22 19:23:08 +01:00

ffserver_config.h

ffsrever: Make the status page bitexact if any stream is bitexact

2016-11-29 19:26:26 +01:00

ffserver.c

ffserver: local OOB write with custom program name

2017-01-08 03:50:56 +01:00

INSTALL.md

INSTALL: add markdown syntax

2014-05-28 22:38:38 +02:00

library.mak

Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1'

2016-06-27 19:39:46 +02:00

LICENSE.md

Merge commit '4fef648d10bf3bcfd4b8fa5755c1128966a2427c'

2017-03-15 22:07:47 +01:00

MAINTAINERS

MAINTAINERS: Add Rodger Combs to ffmpeg-security

2017-02-28 01:13:52 +01:00

Makefile

Makefile: Clean compat/atomics/pthread subdirectory.

2017-03-01 13:43:03 +01:00

README.md

Add CONTRIBUTING.md

2016-09-18 10:02:13 +01:00

RELEASE

RELEASE: Update for past 3.2 branch

2016-10-26 20:52:43 +02:00

version.sh

version.sh: Fix spurious rebuilds.

2016-03-10 09:53:10 +01:00

README.md

FFmpeg README

FFmpeg is a collection of libraries and tools to process multimedia content such as audio, video, subtitles and related metadata.

Libraries

libavcodec provides implementation of a wider range of codecs.
libavformat implements streaming protocols, container formats and basic I/O access.
libavutil includes hashers, decompressors and miscellaneous utility functions.
libavfilter provides a mean to alter decoded Audio and Video through chain of filters.
libavdevice provides an abstraction to access capture and playback devices.
libswresample implements audio mixing and resampling routines.
libswscale implements color conversion and scaling routines.

Tools

ffmpeg is a command line toolbox to manipulate, convert and stream multimedia content.
ffplay is a minimalistic multimedia player.
ffprobe is a simple analysis tool to inspect multimedia content.
ffserver is a multimedia streaming server for live broadcasts.
Additional small tools such as aviocat, ismindex and qt-faststart.

Documentation

The offline documentation is available in the doc/ directory.

The online documentation is available in the main website and in the wiki.

Examples

Coding examples are available in the doc/examples directory.

License

FFmpeg codebase is mainly LGPL-licensed with optional components licensed under GPL. Please refer to the LICENSE file for detailed information.

Contributing

Patches should be submitted to the ffmpeg-devel mailing list using git format-patch or git send-email. Github pull requests should be avoided because they are not part of our review process and will be ignored.

Languages

C 90.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%