1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-08 10:26:55 +02:00
Go to file
Michael Niedermayer edd110ee45 Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'
* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e':
  avconv: use read_file() for reading the 2pass stats

Conflicts:
	cmdutils.c
	cmdutils.h
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 13:33:44 +02:00
compat compat/os2threads: Check av_malloc() return code 2015-06-02 15:16:45 +02:00
doc avformat/mpegtsenc: Add sdt_period, similar to pat_period 2015-07-18 23:26:05 +02:00
libavcodec avcodec/hevc_parser: Treat extradata parsing differently, as it should not contain an AU 2015-07-19 03:24:25 +02:00
libavdevice Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3' 2015-07-11 12:25:03 +02:00
libavfilter avfilter/vf_blend: unbreak tblend 2015-07-18 05:01:16 +00:00
libavformat Merge commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57' 2015-07-19 11:52:35 +02:00
libavresample Merge commit 'd68c05380cebf563915412182643a8be04ef890b' 2015-06-01 00:22:47 +02:00
libavutil avutil/x86/bswap: force inline asm versions with ICC 2015-07-18 20:48:09 -03:00
libpostproc postproc: fix unaligned access 2015-06-19 01:47:59 +02:00
libswresample lswr: Allow 64 channels internally. 2015-07-17 00:17:08 +02:00
libswscale swscale/ppc/yuv2rgb_altivec: POWER LE support in the macros vec_unh() and vec_unl() 2015-07-16 14:27:58 +02:00
presets
tests fate: add tblend filter test 2015-07-18 05:01:16 +00:00
tools Merge commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d' 2015-06-12 22:46:10 +02:00
.gitattributes
.gitignore Merge commit '8bc67ec2c0d2b5444d51a1bed1d50f0e10d92717' 2015-07-12 21:03:06 +02:00
arch.mak use mmi instead of loongson3 as simd-optimization flag 2015-07-07 03:46:57 +02:00
Changelog avfilter: bump minor and add Changelog entry 2015-07-17 11:39:52 +00: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 Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e' 2015-07-19 13:33:44 +02:00
cmdutils.h Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e' 2015-07-19 13:33:44 +02:00
common.mak x86: Makefile: fix DBG parameter evaluation 2015-03-11 01:54:07 +01:00
configure avformat/async: support filling with a background thread. 2015-07-18 01:46:50 +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: log more information on failure to init simple filter graph 2015-07-02 04:56:10 +02:00
ffmpeg_opt.c Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e' 2015-07-19 13:33:44 +02:00
ffmpeg_vda.c Merge commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9' 2015-07-09 12:19:34 +02:00
ffmpeg_vdpau.c
ffmpeg.c Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614' 2015-07-19 12:59:05 +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: check av_asprintf() for failure 2015-06-13 01:45:27 +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: make statement block unconditional by exiting early 2015-06-24 19:17:51 -03:00
INSTALL.md
library.mak build: add LDLIBFLAGS 2015-07-08 14:35:02 +02:00
LICENSE.md avfilter/vf_removegrain: add x86 and x86_64 SSE2 functions 2015-07-14 23:50:50 +00:00
MAINTAINERS MAINTAINERS: add myself as libkvazaar maintainer 2015-07-15 13:03:50 +02:00
Makefile use mmi instead of loongson3 as simd-optimization flag 2015-07-07 03:46:57 +02:00
README.md
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.