1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer da2189596d Merge commit '2df0c32ea12ddfa72ba88309812bfb13b674130f'
* commit '2df0c32ea12ddfa72ba88309812bfb13b674130f':
  lavc: use a separate field for exporting audio encoder padding

Conflicts:
	libavcodec/audio_frame_queue.c
	libavcodec/avcodec.h
	libavcodec/libvorbisenc.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/wmaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14 02:16:16 +02:00
compat w32pthreads: use the condition variable API directly when targeting newer versions of Windows 2014-10-10 11:27:30 +03:00
doc Merge commit '2df0c32ea12ddfa72ba88309812bfb13b674130f' 2014-10-14 02:16:16 +02:00
libavcodec Merge commit '2df0c32ea12ddfa72ba88309812bfb13b674130f' 2014-10-14 02:16:16 +02:00
libavdevice Merge commit '2a5ac99e6e06078713f684fee2466c91f677b303' 2014-10-05 03:42:55 +02:00
libavfilter avfilter/vf_pp: support AV_PIX_FMT_GRAY8 2014-10-13 01:56:14 +02:00
libavformat avformat/utils: print more information with av_dlog() in compute_pkt_fields() 2014-10-13 23:45:52 +02:00
libavresample Add missing "const" all over the place. 2014-08-29 18:57:25 +02:00
libavutil avutil/lzo: fix resource leak 2014-10-11 12:15:26 +02:00
libpostproc postproc: fix qp count 2014-10-13 16:12:30 +02:00
libswresample swresample/audioconvert: Fix undefined behavior (left shift of negative value) 2014-10-08 05:35:06 +02:00
libswscale swscale: support internal scaler cascades 2014-10-11 05:05:17 +02:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests fate: add test for vp90-2-trac3849.webm 2014-10-12 19:45:25 -03:00
tools Merge commit '2bc220958c7570020d87ee353db65460b518998a' 2014-10-09 12:25:52 +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 Changelog: add "ffprobe -show_pixel_formats option" 2014-10-08 16:58:14 +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 Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286' 2014-09-17 19:59:10 +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 w32pthreads: use the CONDITION_VARIABLE typedef if available 2014-10-10 11:27:26 +03:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 2014-04-30 00:46:38 +02:00
ffmpeg_filter.c ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters 2014-09-11 04:55:58 +02:00
ffmpeg_opt.c ffmpeg_opt: abort if -to <= -ss 2014-10-11 22:20:39 +02:00
ffmpeg_vda.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c Merge commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd' 2014-10-06 16:31:51 +02:00
ffmpeg.c Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8' 2014-09-27 02:06:39 +02:00
ffmpeg.h ffmpeg: add vdpau_old to allow continued testing of the older (but not oldest) API 2014-10-06 16:09:02 +02:00
ffplay.c ffplay: dont leave swresampler in half initialized state 2014-10-09 23:18:37 +02:00
ffprobe.c ffprobe: Simplify by using av_color_range_name() 2014-10-10 04:24:55 +02:00
ffserver.c ffserver: use av_freep(), do not leave stale pointers in memory 2014-10-08 15:22:24 +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 Add missing entry for maintainer of rtpenc_hevc.* 2014-09-22 15:01:04 +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 to 2.4.git 2014-09-15 13:11:10 -03:00
RELEASE_NOTES Changelog/RELEASE_NOTES: prepare for 2.4 2014-09-14 13:41:49 +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.