1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 9ecfe0b878 Merge commit 'a72d93daa09ffbad2771f1450820941055eaf210'
* commit 'a72d93daa09ffbad2771f1450820941055eaf210':
  mpegvideo_enc: Check AVCodecContext allocation

Conflicts:
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 21:30:37 +01:00
compat compat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments 2015-02-18 01:49:35 +01:00
doc doc: Clarify documentation for fade duration. 2015-03-09 10:57:58 +01:00
libavcodec Merge commit 'a72d93daa09ffbad2771f1450820941055eaf210' 2015-03-12 21:30:37 +01:00
libavdevice lavd/avfoundation: Silence warnings when compiling for iOS. 2015-03-10 12:11:15 +01:00
libavfilter avfilter/colormatrix:add slice threading 2015-03-12 03:45:42 +01:00
libavformat Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda' 2015-03-12 12:38:20 +01:00
libavresample Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08' 2015-02-22 00:06:23 +01:00
libavutil mips/asmdefs: use _ABI64 as defined by gcc 2015-03-12 16:45:31 +01:00
libpostproc postproc: mark alloc/free context functions as av_cold 2015-02-27 16:15:31 +01:00
libswresample swresample: Add prefix to soxr_resampler 2015-02-27 19:20:43 +01:00
libswscale swscale/utils: Fix undefined shift in initFilter() 2015-03-11 15:40:28 +01:00
presets
tests Merge commit '96a06dbaf278e8152487e08772946f63bd2a3843' 2015-03-10 10:58:44 +01:00
tools tools/graph2dot: Check for av_malloc() failure 2015-02-22 22:51:13 +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 ChangeLog: Remove the redundant VP9 RTP entry 2015-03-07 20:14:39 +01: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: fix success path 2015-02-11 17:28:11 +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 Merge commit '9c8074050745184a61059ad56045ad711299e33d' 2015-03-12 12:25:39 +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.