1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer dd3f1563d7 Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'
* commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba':
  nutenc: check for negative index rather than assert

Conflicts:
	libavformat/nutenc.c

Not merged, the assert is correct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-22 00:09:00 +02:00
compat compat/w32pthreads: use the condition variable API directly when targeting newer versions of Windows 2014-10-09 17:51:46 -03:00
doc doc/ffmpeg.texi: document the new -start_at_zero option 2014-10-21 13:38:44 +02:00
libavcodec avcodec/mjpegdec: simplify chroma_height calculation 2014-10-21 21:36:17 +02:00
libavdevice lavd/fbdev_common: report error during probing fbdev device 2014-10-21 22:57:32 +02:00
libavfilter lavfi/concat: accept a single segment 2014-10-21 13:28:40 +02:00
libavformat Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba' 2014-10-22 00:09:00 +02:00
libavresample Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e' 2014-10-18 22:53:23 +02:00
libavutil avutil/cast5: Fix off by one error 2014-10-20 05:41:26 +02:00
libpostproc postproc: fix qp count 2014-10-13 16:12:30 +02:00
libswresample swresample/resample: fix invert_initial_buffer() after flush 2014-10-16 22:35:27 +02:00
libswscale Merge commit 'fc1eda543c6ef043300612db90da5cfd972af650' 2014-10-18 23:40:50 +02:00
presets
tests fate-mpeg4: use TARGET_SAMPLES for resize tests 2014-10-21 09:57:10 +02:00
tools Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de' 2014-10-16 12:45:01 +02:00
.gitignore gitignore: add test_copy.ffmeta 2014-10-17 15:57:12 +02:00
arch.mak
Changelog libavutil: Add CAST128 symmetric block cipher 2014-10-18 01:33:45 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4' 2014-10-17 14:57:40 +02:00
cmdutils.h
common.mak
configure configure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC is enabled and in LE environment 2014-10-20 19:58:02 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581' 2014-10-17 13:47:49 +02:00
ffmpeg_opt.c ffmpeg_opt: Add -start_at_zero option. 2014-10-21 03:31:33 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c Merge commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd' 2014-10-06 16:31:51 +02:00
ffmpeg.c Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283' 2014-10-18 15:04:42 +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: remove manual bug option handling code 2014-10-17 23:44:04 +02:00
ffprobe.c ffprobe: Add support for color_trc/color_pri/chroma_loc 2014-10-19 20:15:37 +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
library.mak
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
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

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.