mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Go to file

Michael Niedermayer d9b264bc73 Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'

* commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42':
  mpegvideo: Drop flags and flags2

Conflicts:
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/ratecontrol.c
	libavcodec/vc1_block.c
	libavcodec/vc1_loopfilter.c
	libavcodec/vc1_mc.c
	libavcodec/vc1dec.c

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

2015-05-22 20:24:41 +02:00

compat

avisynth: drop support of AviSynth 2.5

2015-03-25 20:37:26 +01:00

doc

doc/ffmpeg: basic documentation for -copy/ignore_unknown

2015-05-21 22:32:24 +02:00

libavcodec

Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'

2015-05-22 20:24:41 +02:00

libavdevice

avdevice/v4l2: Fix vertical alignment in list_formats() output

2015-05-16 14:35:36 +02:00

libavfilter

Merge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512'

2015-05-20 19:14:11 +02:00

libavformat

avformat/mxfenc: Add color siting element

2015-05-22 15:30:31 +02:00

libavresample

Merge commit '0ac8ff618c5e6d878c547a8877e714ed728950ce'

2015-04-29 05:46:35 +02:00

libavutil

avutil/pixfmt: Clarify DV example comments for AVChromaLocation

2015-05-22 12:08:32 +02:00

libpostproc

postproc/postprocess: Use size_t to hold strlen()s value

2015-05-10 16:28:37 +02:00

libswresample

swr: fix alignment issue caused by 8ch sse functions

2015-05-13 22:44:06 +02:00

libswscale

libswscale/x86/hscale_fast_bilinear_simd.c: There's no need to save BX if it's in the clobber list.

2015-05-13 11:59:30 +02:00

presets

…

tests

avformat/mxfenc: Add color siting element

2015-05-22 15:30:31 +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

makefile: add Loongson-3 support

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

Changelog

vp9: add missing changelog and APIchanges entries for new VP9 profiles

2015-05-07 18:35:12 -03: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: add cpuflags for loongson3 series cpu

2015-05-20 17:57:59 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_dxva2.c

ffmpeg_dxva2: add hevc support

2015-01-27 12:37:34 +01:00

ffmpeg_filter.c

ffmpeg_filter: use get_rotation()

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

ffmpeg_opt.c

ffmpeg: Support copying unknown streams

2015-05-21 18:21:38 +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

Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec'

2014-12-27 13:26:38 +01:00

ffmpeg.c

ffmpeg: Support copying unknown streams

2015-05-21 18:21:38 +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&cmdutils:Factor get_rotation() code out

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

ffprobe.c

ffprobe: Use av_packet_side_data_name() to find the side data name

2015-05-07 21:20:26 +02:00

ffserver_config.c

ffserver_config: reflow add_codec()

2014-12-09 01:03:01 -03:00

ffserver_config.h

…

ffserver.c

ffserver: remove stale debug stanza

2015-03-08 18:24:56 -03:00

INSTALL.md

…

library.mak

x86/doc/Makefile: DBG=1 to preprocess external asm

2015-02-17 13:08:04 +01:00

LICENSE.md

LICENSE.md: add *_rect filters

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

MAINTAINERS

MAINTAINERS: Add Lou Logan as server admin as he is root too

2015-04-06 20:24:05 +02:00

Makefile

makefile: add Loongson-3 support

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

README.md

README: add ffserver

2015-02-12 11:59:22 +01:00

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 90.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%