virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
71,525 Commits 37 Branches 400 Tags 465 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
40d552dae6
Go to file
Michael Niedermayer 40d552dae6 Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
  Replace av_dlog with normal av_log at trace level

Conflicts:
	ffplay.c
	libavdevice/fbdev_dec.c
	libavfilter/avfilter.c
	libavfilter/internal.h
	libavfilter/setpts.c
	libavfilter/src_movie.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fieldorder.c
	libavformat/assdec.c
	libavformat/avidec.c
	libavformat/flvdec.c
	libavformat/http.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/mov.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/mpegtsenc.c
	libavformat/mux.c
	libavformat/mxfdec.c
	libavformat/nsvdec.c
	libavformat/oggdec.c
	libavformat/r3d.c
	libavformat/rtspdec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 03:19:47 +02:00
compat avisynth: drop support of AviSynth 2.5 2015-03-25 20:37:26 +01:00
doc Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e' 2015-04-20 02:48:19 +02:00
libavcodec avcodec/mpeg4videodec: Use check_marker() 2015-04-19 15:34:43 +02:00
libavdevice Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 2015-04-20 03:19:47 +02:00
libavfilter Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 2015-04-20 03:19:47 +02:00
libavformat Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 2015-04-20 03:19:47 +02:00
libavresample Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 2015-04-20 03:19:47 +02:00
libavutil Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e' 2015-04-20 02:48:19 +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 tests/tiny_psnr: Make the search range extend both sides from the specified shift value 2015-04-17 21:22:27 +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 avfilter: add chorus filter 2015-04-11 20:39:43 +00: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_opt.c Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035' 2015-04-04 00:38:02 +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: last frame duplication heuristic 2015-04-03 19:09:31 +02:00
ffplay.c Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 2015-04-20 03:19:47 +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.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

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 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.