mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-07-25 00:37:28 +00:00

Go to file

Michael Niedermayer b68b5ec513 Merge commit '5e87080f2c73186066df0b9c43877b4af0beef3a'

* commit '5e87080f2c73186066df0b9c43877b4af0beef3a':
  h264_weight: Fix SSSE3 biweight code with weights of 128

Conflicts:
	libavcodec/x86/h264_weight.asm

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

2015-06-12 21:47:01 +02:00

compat

compat/os2threads: Check av_malloc() return code

2015-06-02 15:16:45 +02:00

doc

doc/filters: add one more zoompan example

2015-06-12 17:34:05 +00:00

libavcodec

Merge commit '5e87080f2c73186066df0b9c43877b4af0beef3a'

2015-06-12 21:47:01 +02:00

libavdevice

avdevice/openal-dec: Make al_format_info const

2015-06-11 00:48:41 +02:00

libavfilter

avfilter/vf_zoompan: support planar rgb pixel formats

2015-06-12 17:15:20 +00:00

libavformat

avformat/mxfdec: Detect jpeg2000 through codec_ul too

2015-06-12 19:40:48 +02:00

libavresample

Merge commit 'd68c05380cebf563915412182643a8be04ef890b'

2015-06-01 00:22:47 +02:00

libavutil

avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for AVC idct functions

2015-06-11 17:10:45 +02:00

libpostproc

postproc: Avoid floats in maxClipped computation

2015-05-31 01:40:12 +02:00

libswresample

swr: Fix ASSERT_LEVEL warning

2015-06-08 20:16:06 +02:00

libswscale

Mark vectors as NAN instead of dereferencing NULL pointers on malloc failure

2015-06-12 15:06:32 +02:00

presets

…

tests

fate: Force jpeg2000 decoder for dcinema

2015-06-09 20:09:12 +02:00

tools

tools/graph2dot: use larger data types than int for array/string sizes

2015-05-12 04:01:25 +02:00

.gitattributes

…

.gitignore

doc/examples: add directory listing example

2015-03-28 03:13:44 +01:00

arch.mak

Merge commit 'eecd29b3fd7fee221580798346d6582b75c7ade4'

2015-05-31 23:42:36 +02:00

Changelog

Changelog: Add 2.7 entry

2015-06-09 23:14:57 +02:00

cmdutils_common_opts.h

…

cmdutils_opencl.c

OpenCL: Avoid potential buffer overflow in cmdutils_opencl.c

2015-04-28 12:18:23 +02:00

cmdutils.c

cmdutils: Fix sign error in display matrix auto-rotation code

2015-05-18 02:07:34 +02:00

cmdutils.h

ffplay&cmdutils:Factor get_rotation() code out

2015-05-03 23:49:16 +02:00

common.mak

x86: Makefile: fix DBG parameter evaluation

2015-03-11 01:54:07 +01:00

configure

configure: Disable VSX on unspecified / generic CPUs

2015-06-12 13:37:04 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_dxva2.c

ffmpeg_dxva2: call GetDesktopWindow() in place of GetShellWindow()

2015-06-03 16:25:08 +02:00

ffmpeg_filter.c

ffmpeg_filter: use get_rotation()

2015-05-04 00:14:36 +02:00

ffmpeg_opt.c

ffmpeg_opt: Check for localtime() failure

2015-06-12 15:36:20 +02:00

ffmpeg_vda.c

vda: Cast to not discard constant qualifier and silence compiler warning

2015-04-09 01:23:33 +02:00

ffmpeg_vdpau.c

…

ffmpeg.c

ffmpeg: do not print misleading recommanditions on 1pass vpx encoding

2015-05-26 23:42:44 +02:00

ffmpeg.h

ffmpeg: Do not copy the display matrix if rotation meta-data is manually added

2015-05-18 00:52:36 +02:00

ffplay.c

ffplay: use av_clip() instead of nested min & max

2015-06-06 13:18:28 +02:00

ffprobe.c

ffprobe: print stream_index with frame data

2015-05-27 11:19:19 +02:00

ffserver_config.c

ffserver: Use singlejpeg muxer for jpeg

2015-06-08 03:36:22 +02:00

ffserver_config.h

ffserver: Use singlejpeg muxer for jpeg

2015-06-08 03:36:22 +02:00

ffserver.c

ffserver: Use singlejpeg muxer for jpeg

2015-06-08 03:36:22 +02:00

INSTALL.md

…

library.mak

build: add configure option pkgconfigdir

2015-05-29 20:36:10 +02:00

LICENSE.md

LICENSE.md: add *_rect filters

2015-05-03 01:43:30 +02:00

MAINTAINERS

MAINTAINERS: add 2.7

2015-06-09 23:55:19 +02:00

Makefile

makefile: add Loongson-3 support

2015-04-27 14:10:28 +02:00

README.md

…

RELEASE

RELEASE: update to 2.6.git

2015-03-08 18:59:57 -03:00

version.sh

…

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.

Languages

C 89%

Assembly 8.4%

Makefile 1.4%

GLSL 0.4%

C++ 0.3%

Other 0.2%