Go to file
Michael Niedermayer ae215e2b42 Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77'
* commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77':
  mp3: enable packed main_data decoding in MP4

Conflicts:
	libavcodec/mpegaudiodec_template.c

Only the parts needed to support the available sample are merged
the remaining error checks are left in place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-21 20:32:06 +02:00
compat compat/os2threads: Check av_malloc() return code 2015-06-02 15:16:45 +02:00
doc libvpxenc: support setting colorspace for vp9 2015-06-20 16:30:46 -07:00
libavcodec Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77' 2015-06-21 20:32:06 +02:00
libavdevice doc: avoid incorrect phrase 'allows to' 2015-06-16 21:48:51 +02:00
libavfilter libavfilter/formats: Fix parsing of channel specifications with a trailing 'c'. 2015-06-20 19:51:14 +02:00
libavformat Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77' 2015-06-21 20:32:06 +02:00
libavresample Merge commit 'd68c05380cebf563915412182643a8be04ef890b' 2015-06-01 00:22:47 +02:00
libavutil avutil/fixed_dsp: remove ff_ prefix from static function 2015-06-20 03:39:09 -03:00
libpostproc postproc: fix unaligned access 2015-06-19 01:47:59 +02:00
libswresample swresample/swresample: Print used int_sample_fmt 2015-06-21 18:12:56 +02:00
libswscale swscale/output: Add rgba64/rgb48/bgra64/bgr48 output functions with full chroma interpolation 2015-06-17 00:45:46 +02:00
presets
tests Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77' 2015-06-21 20:32:06 +02:00
tools Merge commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d' 2015-06-12 22:46:10 +02:00
.gitattributes
.gitignore
arch.mak Merge commit 'eecd29b3fd7fee221580798346d6582b75c7ade4' 2015-05-31 23:42:36 +02:00
Changelog lavf/brstm: support little-endian files (BCSTM; 3DS) 2015-06-20 16:50:47 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c cmdutils: Fix sign error in display matrix auto-rotation code 2015-05-18 02:07:34 +02:00
cmdutils.h ffplay&cmdutils:Factor get_rotation() code out 2015-05-03 23:49:16 +02:00
common.mak
configure configure: make makeinfo_html check more robust 2015-06-16 21:47:17 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c ffmpeg_dxva2: call GetDesktopWindow() in place of GetShellWindow() 2015-06-03 16:25:08 +02:00
ffmpeg_filter.c ffmpeg_filter: use get_rotation() 2015-05-04 00:14:36 +02:00
ffmpeg_opt.c ffmpeg_opt: Fix handling of creation_time now 2015-06-21 04:57:20 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: Free last_frame instead of just unref 2015-06-18 05:27:08 +02:00
ffmpeg.h ffmpeg: Do not copy the display matrix if rotation meta-data is manually added 2015-05-18 00:52:36 +02:00
ffplay.c ffplay: use av_clip() instead of nested min & max 2015-06-06 13:18:28 +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: Use singlejpeg muxer for jpeg 2015-06-08 03:36:22 +02:00
INSTALL.md
library.mak library.mak: Workaround SDL redefining main and breaking fate tests on mingw 2015-06-19 12:12:27 +02:00
LICENSE.md
MAINTAINERS MAINTAINERS: add myself as hls encryption maintainer 2015-06-16 16:52:38 +02:00
Makefile
README.md
RELEASE
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 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.