1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
James Almer f41048f6ec Merge commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c'
* commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c':
  h264: add H264_ prefix to the NAL unit types

Conflicts:
libavcodec/h264_parse.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
libavcodec/h264dec.c

Merged-by: James Almer <jamrial@gmail.com>
2016-08-01 15:11:05 -03:00
compat Merge commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43' 2016-05-08 23:02:33 +01:00
doc Doxygen: Re-enable JAVADOC_AUTOBRIEF 2016-07-31 20:56:23 -07:00
libavcodec Merge commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c' 2016-08-01 15:11:05 -03:00
libavdevice avdev/jack: remove duplicated dispatch macros 2016-07-26 23:10:47 +01:00
libavfilter af_hdcd: Move code detect/check into own function 2016-08-01 19:48:32 +02:00
libavformat Merge commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c' 2016-08-01 15:11:05 -03:00
libavresample Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24' 2016-06-27 17:56:47 +02:00
libavutil dynarray: Change AV_ to FF_ for AV_DYNARRAY_ADD 2016-07-31 10:19:03 -07:00
libpostproc Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24' 2016-06-27 17:56:47 +02:00
libswresample Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24' 2016-06-27 17:56:47 +02:00
libswscale Revert "PPC64: Add versions of functions in libswscale/input.c optimized for POWER8 VSX SIMD." 2016-07-11 10:15:05 -04:00
presets
tests libavformat/matroskadec: Add test for seeking with codec delay. 2016-07-30 01:02:41 +02:00
tools tools/patcheck: add a couple more common typos 2016-07-17 18:38:14 -03:00
.gitattributes
.gitignore Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1' 2016-06-26 15:43:05 +02:00
.travis.yml
arch.mak
Changelog Changelog: add entry for MediaCodec hwaccel 2016-07-28 16:11:52 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c avconv: switch to the new BSF API 2016-03-20 08:15:01 +01:00
cmdutils.h
common.mak Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1' 2016-06-27 19:39:46 +02:00
configure Add an OpenH264 decoder wrapper 2016-07-27 10:19:40 +03:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_cuvid.c ffmpeg: Add cuvid hwaccel support 2016-06-10 16:31:23 +02:00
ffmpeg_dxva2.c Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28' 2016-06-26 15:34:01 +02:00
ffmpeg_filter.c ffmpeg_filter: Fix AVBufferSrcParameters leak 2016-05-19 00:10:27 +02:00
ffmpeg_opt.c ffmpeg_opt: Delete duplicate “hwaccel_output_format” option. 2016-07-20 12:07:38 +02:00
ffmpeg_qsv.c
ffmpeg_vaapi.c Merge commit '9f7590f4e497c12693247d7f935a20d7773a64dd' 2016-06-26 15:36:27 +02:00
ffmpeg_vdpau.c Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6' 2016-06-26 15:29:39 +02:00
ffmpeg_videotoolbox.c
ffmpeg.c ffmpeg.c: copy video profile when using stream_copy 2016-07-23 03:52:38 +02:00
ffmpeg.h ffmpeg: Add cuvid hwaccel support 2016-06-10 16:31:23 +02:00
ffplay.c ffplay: Fix usage of private lavfi API 2016-06-29 12:53:01 +02:00
ffprobe.c ffprobe: add missing PROGRAM_STREAM_TAGS case 2016-07-26 19:22:47 +02:00
ffserver_config.c
ffserver_config.h
ffserver.c ffserver: fixed deallocation bug in build_feed_streams 2016-05-27 00:22:06 +02:00
INSTALL.md
library.mak Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1' 2016-06-27 19:39:46 +02:00
LICENSE.md avcodec: remove libutvideo wrapper support 2016-06-23 13:04:11 +02:00
MAINTAINERS MAINTAINERS: Add myself for af_hdcd 2016-08-01 19:47:54 +02:00
Makefile Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1' 2016-06-26 15:43:05 +02:00
README.md
RELEASE
version.sh version.sh: Fix spurious rebuilds. 2016-03-10 09:53:10 +01: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.

Contributing

Patches should be submitted to the ffmpeg-devel mailing list using git format-patch or git send-email. Github pull requests should be avoided because they are not part of our review process. Few developers follow pull requests so they will likely be ignored.