1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 94d68a41fa Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
  lavc: AV-prefix all codec flags

Conflicts:
	doc/examples/muxing.c
	ffmpeg.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/ac3enc_float.c
	libavcodec/atrac1.c
	libavcodec/atrac3.c
	libavcodec/atrac3plusdec.c
	libavcodec/dcadec.c
	libavcodec/ffv1enc.c
	libavcodec/h264.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mb.c
	libavcodec/imc.c
	libavcodec/libmp3lame.c
	libavcodec/libtheoraenc.c
	libavcodec/libtwolame.c
	libavcodec/libvpxenc.c
	libavcodec/libxavs.c
	libavcodec/libxvid.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegaudiodec_template.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/nellymoserdec.c
	libavcodec/nellymoserenc.c
	libavcodec/nvenc.c
	libavcodec/on2avc.c
	libavcodec/options_table.h
	libavcodec/opus_celt.c
	libavcodec/pngenc.c
	libavcodec/ra288.c
	libavcodec/ratecontrol.c
	libavcodec/twinvq.c
	libavcodec/vc1_block.c
	libavcodec/vc1_loopfilter.c
	libavcodec/vc1_mc.c
	libavcodec/vc1dec.c
	libavcodec/vorbisdec.c
	libavcodec/vp3.c
	libavcodec/wma.c
	libavcodec/wmaprodec.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 22:10:35 +02:00
compat use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe 2015-07-24 20:02:32 +02:00
doc Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
libavcodec Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
libavdevice Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370' 2015-07-21 01:17:15 +02:00
libavfilter Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
libavformat Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
libavresample Merge commit 'd68c05380cebf563915412182643a8be04ef890b' 2015-06-01 00:22:47 +02:00
libavutil x86/float_dsp: add missing colon to labels 2015-07-26 02:51:08 -03:00
libpostproc postproc: fix unaligned access 2015-06-19 01:47:59 +02:00
libswresample swresample/x86: add missing colon to labels 2015-07-26 02:51:13 -03:00
libswscale swscale/output: Fix "warning: assignment from incompatible pointer type" 2015-07-25 03:15:56 +02:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests AAC Encoder: clipping avoidance 2015-07-27 19:13:48 +02:00
tools Merge commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d' 2015-06-12 22:46:10 +02:00
.gitattributes Treat all '*.pnm' files as non-text file 2014-11-28 17:52:43 -05:00
.gitignore Merge commit '8bc67ec2c0d2b5444d51a1bed1d50f0e10d92717' 2015-07-12 21:03:06 +02:00
arch.mak use mmi instead of loongson3 as simd-optimization flag 2015-07-07 03:46:57 +02:00
Changelog avfilter: add acrossfade filter 2015-07-26 21:54:13 +00:00
cmdutils_common_opts.h opts: add list device sources/sinks options 2014-10-25 20:20:31 +02:00
cmdutils_opencl.c OpenCL: Avoid potential buffer overflow in cmdutils_opencl.c 2015-04-28 12:18:23 +02:00
cmdutils.c Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e' 2015-07-19 13:33:44 +02:00
cmdutils.h Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e' 2015-07-19 13:33:44 +02:00
common.mak Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5' 2015-07-22 16:30:37 +02:00
configure Merge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c' 2015-07-27 13:20:12 +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 ffmpeg_dxva2: call GetDesktopWindow() in place of GetShellWindow() 2015-06-03 16:25:08 +02:00
ffmpeg_filter.c Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
ffmpeg_opt.c Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
ffmpeg_vda.c Merge commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9' 2015-07-09 12:19:34 +02:00
ffmpeg_vdpau.c Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec' 2014-12-27 13:26:38 +01:00
ffmpeg.c Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
ffmpeg.h Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b' 2015-07-21 00:54:42 +02:00
ffplay.c Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 2015-07-27 22:10:35 +02:00
ffprobe.c ffprobe: check av_asprintf() for failure 2015-06-13 01:45:27 +02:00
ffserver_config.c ffserver: Use singlejpeg muxer for jpeg 2015-06-08 03:36:22 +02:00
ffserver_config.h ffserver: Use singlejpeg muxer for jpeg 2015-06-08 03:36:22 +02:00
ffserver.c ffserver: add (), fix order of operations 2015-07-27 11:40:00 +02:00
INSTALL.md INSTALL: add markdown syntax 2014-05-28 22:38:38 +02:00
library.mak build: add LDLIBFLAGS 2015-07-08 14:35:02 +02:00
LICENSE.md avfilter/vf_removegrain: add x86 and x86_64 SSE2 functions 2015-07-14 23:50:50 +00:00
MAINTAINERS MAINTAINERS: add myself as a maintainer for async protocol 2015-07-21 10:40:31 +02:00
Makefile Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5' 2015-07-22 16:30:37 +02:00
README.md README: add ffserver 2015-02-12 11:59:22 +01:00
RELEASE RELEASE: update to 2.7.git 2015-07-19 17:52:31 -03: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 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.