1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 037c9c25e6 Merge commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf'
* commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf':
  h264_ps: Return meaningful error codes and address a memory leak

Conflicts:
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 22:49:50 +02:00
compat avisynth: drop support of AviSynth 2.5 2015-03-25 20:37:26 +01:00
doc ffmpeg: add option not to offset seek position by start time 2015-04-20 19:50:58 +02:00
libavcodec Merge commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf' 2015-04-20 22:49:50 +02:00
libavdevice Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a' 2015-04-20 12:46:29 +02:00
libavfilter avfilter/buffersrc: Use correct, matching deallocation function 2015-04-20 12:33:20 +02:00
libavformat Merge commit 'd34039b171bebe37bf723a1b03e5651267099739' 2015-04-20 22:24:38 +02:00
libavresample Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 2015-04-20 03:19:47 +02:00
libavutil avutil/mips/generic_macros_msa: volatile doesnt need __ 2015-04-20 14:39:50 +02:00
libpostproc postproc: Removed unecessary if/else branch when getting QP. 2015-03-28 01:49:12 +01:00
libswresample swresample/swresample-test: Randomly wipe out channel counts 2015-04-12 22:21:53 +02:00
libswscale swscale/output: Fix undefined shifts 2015-03-25 18:31:25 +01:00
presets
tests fate: gapless: fix mp3 tests 2015-04-20 19:50:58 +02:00
tools tools/sidxindex: Use av_*malloc_array() 2015-04-01 17:43:25 +02:00
.gitattributes Treat all '*.pnm' files as non-text file 2014-11-28 17:52:43 -05:00
.gitignore doc/examples: add directory listing example 2015-03-28 03:13:44 +01:00
arch.mak Makefile: Add support for MSA (MIPS-SIMD-Arch) 2015-04-17 17:38:41 +02:00
Changelog Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437' 2015-04-20 05:28:13 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e' 2015-04-20 02:48:19 +02:00
cmdutils.h
common.mak x86: Makefile: fix DBG parameter evaluation 2015-03-11 01:54:07 +01:00
configure configure: remove old libdcadec check 2015-04-16 20:10:19 -03: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: add option not to offset seek position by start time 2015-04-20 19:50:58 +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: Fix null pointer dereference in do_video_out() 2015-04-19 23:44:19 +02:00
ffmpeg.h ffmpeg: add option not to offset seek position by start time 2015-04-20 19:50:58 +02:00
ffplay.c Merge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6' 2015-04-20 12:12:03 +02: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 MAINTAINERS: Add Lou Logan as server admin as he is root too 2015-04-06 20:24:05 +02:00
Makefile Makefile: Add support for MSA (MIPS-SIMD-Arch) 2015-04-17 17:38:41 +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

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.