1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-09 17:20:21 +02:00
Go to file
Michael Niedermayer 75a9859ac6 Merge commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b'
* commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b':
  wma: K&R formatting cosmetics

Conflicts:
	libavcodec/wma.c
	libavcodec/wmadec.c
	libavcodec/wmaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03 22:10:21 +02:00
compat Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 2014-08-15 21:00:50 +02:00
doc doc/demuxers: document gif demuxer 2014-09-03 10:16:05 -08:00
libavcodec Merge commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b' 2014-09-03 22:10:21 +02:00
libavdevice Merge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d' 2014-09-03 13:58:41 +02:00
libavfilter vf_deshake: Avoid doing a malloc+free for every single frame. 2014-09-02 19:20:28 +02:00
libavformat Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835' 2014-09-03 14:56:53 +02:00
libavresample Add missing "const" all over the place. 2014-08-29 18:57:25 +02:00
libavutil libavutil/error: fix build with musl toolchain 2014-09-03 20:01:25 +02:00
libpostproc Add missing "const" all over the place. 2014-08-29 18:57:25 +02:00
libswresample swr: aarch64 audio_convert and neon clobber test 2014-08-27 20:06:37 +02:00
libswscale lsws: duplicate ff_log2_tab 2014-08-12 20:52:21 +02:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453' 2014-09-03 04:09:38 +02:00
tools Merge commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c' 2014-09-03 15:04:34 +02:00
.gitignore avcodec: export motion vectors in frame side data on demand 2014-08-18 14:13:57 +02:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835' 2014-09-03 14:56:53 +02:00
cmdutils_common_opts.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
cmdutils_opencl.c cmdutils_opencl: Use av_malloc_array() 2014-07-01 03:49:36 +02:00
cmdutils.c cmdutils: Add some whitespace when printing layouts 2014-09-02 18:44:07 +02:00
cmdutils.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
common.mak Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b' 2014-05-20 03:33:30 +02:00
configure Merge commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305' 2014-09-03 14:24:53 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_dxva2.c Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 2014-04-30 00:46:38 +02:00
ffmpeg_filter.c ffmpeg: Enable compute_edt only when the subtitles are used for a output stream instead of a filter 2014-09-01 19:51:58 +02:00
ffmpeg_opt.c ffmpeg_opt: reduce diff to libav in opt_target() by 16 lines 2014-08-27 14:27:30 +02:00
ffmpeg_vda.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c ffmpeg: Enable compute_edt only when the subtitles are used for a output stream instead of a filter 2014-09-01 19:51:58 +02:00
ffmpeg.h ffmpeg: Enable compute_edt only when the subtitles are used for a output stream instead of a filter 2014-09-01 19:51:58 +02:00
ffplay.c ffplay: use av_malloc_array() 2014-08-26 00:41:09 +02:00
ffprobe.c ffprobe: add -show_data_hash option. 2014-08-17 11:30:55 +02:00
ffserver.c Add missing "const" all over the place. 2014-08-29 18:57:25 +02:00
INSTALL.md INSTALL: add markdown syntax 2014-05-28 22:38:38 +02:00
library.mak Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830' 2014-07-22 02:45:45 +02:00
LICENSE.md Merge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5' 2014-08-29 01:08:57 +02:00
MAINTAINERS avformat/rtpdec: support for HEVC/H.265 RTP payload format (draft v6) depacketizing 2014-08-26 02:18:08 +02:00
Makefile Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d' 2014-07-22 03:06:43 +02:00
README.md Merge commit '96ce6d6f119a16e489941c629a2805204322b717' 2014-08-17 21:41:55 +02:00
RELEASE RELEASE: update, we are after 2.3 not 2.2 2014-07-28 03:11:04 +02:00
RELEASE_NOTES RELEASE_NOTES: mention libmodplug detection change 2014-09-01 11:36:02 +02:00
version.sh version.sh: Print versions based on the last git tag for release branches 2014-07-28 15:44:59 +02:00

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

Conding examples are available in the doc/example directory.

License

FFmpeg codebase is mainly LGPL-licensed with optional components licensed under GPL. Please refer to the LICENSE file for detailed information.