generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
65,801 Commits 24 Branches 241 Tags 173 MiB
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%
f6ff1cb1ba
Go to file
Michael Niedermayer f6ff1cb1ba Merge commit '7cb66ebc0be48489785f7166c9d15eac594b0763' 
* commit '7cb66ebc0be48489785f7166c9d15eac594b0763':
  error_resilience: Drop asserts from guess_mv()

Conflicts:
	libavcodec/error_resilience.c

Not merged, the asserts in FFmpeg build and work fine

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-21 21:30:31 +02:00
compat Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 2014-08-15 21:00:50 +02:00
doc doc/filters/apad: extend documentation 2014-08-21 16:59:18 +02:00
libavcodec x86/hevc_res_add: refactor ff_hevc_transform_add{16,32}_8 2014-08-21 15:01:33 -03:00
libavdevice Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2' 2014-08-19 18:33:46 +02:00
libavfilter lavfi/apad: fix logic when whole_len or pad_len options are specified 2014-08-21 16:59:07 +02:00
libavformat avformat/mov: use 64bit for size in mov_skip_multiple_stsd() 2014-08-21 17:49:37 +02:00
libavresample Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e' 2014-08-17 21:43:06 +02:00
libavutil avutil/motion_vector.h: fix coordinate types 2014-08-21 12:27:34 +02:00
libpostproc Drop remaining unneeded != NULL 2014-08-15 22:47:45 +02:00
libswresample swresample: Add AVFrame based API 2014-08-16 20:39: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 fate: add test for old (v1) huffyuv and rgba 2014-08-21 02:20:07 +02:00
tools Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867' 2014-08-15 21:26:12 +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 '481a3667495425db9fdffb653292b6460fb68208' 2014-08-14 00:41:21 +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 Drop remaining unneeded != NULL 2014-08-15 22:47:45 +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 avcodec: export motion vectors in frame side data on demand 2014-08-18 14:13:57 +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_filter: refuse to configure input without a decoder. 2014-07-30 14:40:45 +02:00
ffmpeg_opt.c Use new av_dict_set_int helper function. 2014-08-16 14:31:41 +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 Drop remaining unneeded != NULL 2014-08-15 22:47:45 +02:00
ffmpeg.h ffmpeg: remove 32 channel limit from audio_channels_map 2014-08-15 05:38:47 +02:00
ffplay.c Use new av_dict_set_int helper function. 2014-08-16 14:31:41 +02:00
ffprobe.c ffprobe: add -show_data_hash option. 2014-08-17 11:30:55 +02:00
ffserver.c ffserver: warn if config uses a system port 2014-08-17 22:51:45 -04: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 lavc/flacenc: add sse4 version of the 16-bit lpc encoder 2014-08-13 01:14:47 +02:00
MAINTAINERS avfilter: ported lenscorrection filter from frei0r 2014-08-12 03:33:30 +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 Prepare for 11_beta1 Release 2014-08-17 22:18:19 -04:00
RELEASE_NOTES reset and complete RELEASE_NOTES for the next version 2014-08-13 21:03:55 +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

README.md

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.