1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer 50255b7a86 Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'
* commit '342fc46c69199b076b7c210f42208ce39a2bde1c':
  cmdutils: Add a stream specifier to map usable streams

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-20 20:15:40 +01:00
compat compat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments 2015-02-18 01:49:35 +01:00
doc Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c' 2015-03-20 20:15:40 +01:00
libavcodec avcodec/libvpxenc: Set min/max quantizer to 0 for lossless mode 2015-03-20 19:22:33 +01:00
libavdevice xcbgrab: Check av_strdup() allocation 2015-03-12 15:29:59 +00:00
libavfilter avfilter/vf_mcdeint: Change enums to int, which are accessed via AVOption as int 2015-03-20 19:12:57 +01:00
libavformat Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c' 2015-03-20 20:15:40 +01:00
libavresample Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08' 2015-02-22 00:06:23 +01:00
libavutil libavutil: add bmi2 optimized av_mod_uintp2 2015-03-20 15:47:43 -03:00
libpostproc postproc: mark alloc/free context functions as av_cold 2015-02-27 16:15:31 +01:00
libswresample swresample/resample: Fix undefined shifts 2015-03-14 01:15:37 +01:00
libswscale Merge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c' 2015-03-16 00:15:16 +01:00
presets
tests avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
tools Merge commit '30a041887f89cd97c372ad6a516da6e012f2c88b' 2015-03-19 14:00:39 +01:00
.gitattributes Treat all '*.pnm' files as non-text file 2014-11-28 17:52:43 -05:00
.gitignore Merge commit '11e05533170485b593974cf90916425a0188e7bd' 2015-02-02 21:16:15 +01:00
arch.mak configure, mips: remove MIPS32R2, merging it with MIPSFPU 2015-03-06 14:01:31 +01:00
Changelog avcodec/libdcadec: add missing version bump and changelog entry 2015-03-19 21:09:42 -03:00
cmdutils_common_opts.h opts: add list device sources/sinks options 2014-10-25 20:20:31 +02:00
cmdutils_opencl.c
cmdutils.c cmdutils: Add a stream specifier to map usable streams 2015-03-20 16:10:20 +01:00
cmdutils.h opts: add list device sources/sinks options 2014-10-25 20:20:31 +02:00
common.mak x86: Makefile: fix DBG parameter evaluation 2015-03-11 01:54:07 +01:00
configure configure: Silence warnings about constant unsigned overflows in MSVC 2015-03-20 15:53:44 +01: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: fix accurate seeking with -copyts 2014-11-24 17:31:26 +01:00
ffmpeg_opt.c ffmpeg: allow to set the thread message queue size. 2015-02-26 19:19:56 +01:00
ffmpeg_vda.c
ffmpeg_vdpau.c Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec' 2014-12-27 13:26:38 +01:00
ffmpeg.c Merge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56' 2015-03-10 10:49:48 +01:00
ffmpeg.h ffmpeg: allow to set the thread message queue size. 2015-02-26 19:19:56 +01:00
ffplay.c ffplay: Switch to show waves mode if allocation/init of RDFT fails 2015-03-04 03:04:04 +01:00
ffprobe.c Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f' 2015-03-08 23:58:18 +01:00
ffserver_config.c ffserver_config: reflow add_codec() 2014-12-09 01:03:01 -03:00
ffserver_config.h ffserver: dont leak child arguments 2014-11-26 23:32:33 +01:00
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: Formatting updates 2015-02-12 01:53:56 +01:00
MAINTAINERS Add 2.6 to maintained releases 2015-03-06 17:42:36 +01:00
Makefile configure, mips: remove MIPS32R2, merging it with MIPSFPU 2015-03-06 14:01:31 +01: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

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.