1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Go to file
Michael Niedermayer 95f719fb8f Merge commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff'
* commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff':
  mkv: Validate ASS Start and End fields

Conflicts:
	libavformat/matroskaenc.c

No change as the changed code is not in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 23:32:40 +01:00
compat
doc doc/examples/filtering_video: fix frame rate 2014-12-05 16:52:19 +01:00
libavcodec Merge commit 'c45eeb2dbf42382d335da8068231a8026c08843b' 2014-12-05 22:48:47 +01:00
libavdevice Fix standalone compilation of the iec61883 input device. 2014-12-04 01:35:47 +01:00
libavfilter Revert "avfilter/vf_interlace: more accurate pts calculation" 2014-12-02 18:48:03 +01:00
libavformat avformat/mpegts: fix Opus stream count 2014-12-05 16:00:11 +01:00
libavresample
libavutil avutil/ppc/util_altivec: add () to VEC_SPLAT16 macro 2014-11-29 13:40:33 +01:00
libpostproc
libswresample
libswscale swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output 2014-12-03 20:21:56 +01:00
presets
tests tests: Add vsynth2 which uses the new reference.pnm 2014-12-02 03:39:56 +01:00
tools
.gitattributes Treat all '*.pnm' files as non-text file 2014-11-28 17:52:43 -05:00
.gitignore
arch.mak
Changelog Changelog: add 2.5 entry 2014-12-04 01:28:06 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure configure: add a note about pkg-config --static. 2014-12-02 18:43:54 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: take bsf arguments from the command line 2014-11-30 13:11:34 +01:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: drop usage of coded_frame 2014-12-03 03:06:43 +01:00
ffmpeg.h ffmpeg: take bsf arguments from the command line 2014-11-30 13:11:34 +01:00
ffplay.c
ffprobe.c
ffserver_config.c ffserver_config: print warning when using default value 2014-12-02 21:58:35 +01:00
ffserver_config.h ffserver: dont leak child arguments 2014-11-26 23:32:33 +01:00
ffserver.c ffserver: use avcodec_copy_context to copy context 2014-12-02 21:58:34 +01:00
INSTALL.md
library.mak
LICENSE.md LICENSE.md: Add tests/reference.pnm 2014-11-30 19:12:22 +01:00
MAINTAINERS MAINTAINERS: add 2.5 2014-12-04 14:24:59 +01:00
Makefile
README.md
RELEASE RELEASE: Bump 2014-12-04 11:44:35 +01:00
RELEASE_NOTES RELEASE_NOTES: update for 2.5 2014-12-03 22:40:02 +01: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 analisys tool to inspect multimedia content.
  • 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.