1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Go to file
Michael Niedermayer abf357a9fb Merge commit 'dcf969e98d3f596006a0ddaf077870408b9c09c3'
* commit 'dcf969e98d3f596006a0ddaf077870408b9c09c3':
  rtpdec_mpeg4: add more verbose error logging

Conflicts:
	libavformat/rtpdec_mpeg4.c

See: fee2cc39be
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 01:49:37 +01:00
compat compat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments 2015-02-18 01:49:35 +01:00
doc Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6' 2015-02-21 12:08:31 +01:00
libavcodec Merge commit '5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a' 2015-02-22 01:08:28 +01:00
libavdevice Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a' 2015-02-16 02:56:17 +01:00
libavfilter avfilter/vf_perspective: Use av_clip_uint8() 2015-02-21 14:51:07 +01:00
libavformat Merge commit '96084251e57d1738fde02a2b0d37ca609d9efd71' 2015-02-22 01:30:17 +01:00
libavresample Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08' 2015-02-22 00:06:23 +01:00
libavutil Merge commit '76ce9bd8e26dcb3652240a1072840ff4011d7cdc' 2015-02-21 11:15:32 +01:00
libpostproc
libswresample swresample: add av_cold to init functions 2015-02-21 00:33:09 +01:00
libswscale swscale: Use av_clip_uintp2() 2015-02-21 14:49:17 +01:00
presets
tests Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6' 2015-02-21 12:08:31 +01:00
tools Add coverity model file 2015-02-21 23:45:08 +01:00
.gitattributes
.gitignore Merge commit '11e05533170485b593974cf90916425a0188e7bd' 2015-02-02 21:16:15 +01:00
arch.mak
Changelog Merge commit '96084251e57d1738fde02a2b0d37ca609d9efd71' 2015-02-22 01:30:17 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c cmdutils: fix success path 2015-02-11 17:28:11 +01:00
cmdutils.h
common.mak Makefile: improve DBG option for asm 2015-02-21 03:23:55 +01:00
configure Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d' 2015-02-19 21:12:19 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: Add missing MATCH_PER_TYPE_OPT() for data codecs 2015-02-18 22:13:35 +01:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: Print negative times like "-00:05:01.22" instead of "00:-5:-1.-22" 2015-02-11 11:22:27 +01:00
ffmpeg.h ffmpeg: Make CFR frame drop threshold user adjustable 2015-02-04 02:40:41 +01:00
ffplay.c Merge commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4' 2015-02-17 21:16:34 +01:00
ffprobe.c Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e' 2015-02-14 21:27:44 +01:00
ffserver_config.c
ffserver_config.h
ffserver.c ffserver: fix wrong indentation 2015-02-15 15:15:41 -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 Oleksij as maintainer for DSS* 2015-02-20 16:17:46 +01:00
Makefile
README.md README: add ffserver 2015-02-12 11:59:22 +01:00
RELEASE
RELEASE_NOTES
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.