1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Clément Bœsch 85452f9ab7 Merge commit 'e807491fc6a336e4becc0cbc981274a8fde18aba'
* commit 'e807491fc6a336e4becc0cbc981274a8fde18aba':
  mpeg12dec: avoid signed overflow in bitrate calculation
  mpegvideo_parser: avoid signed overflow in bitrate calculation

This merge is a noop.

2017-04-29 12:54:15     @ubitux michaelni: is 740959fdbf enough to fix the overflow fixed in 58405de0951a843765625159402870c1eea3c3b1?
2017-04-29 12:55:53     @ubitux same question with e807491fc6
2017-04-29 13:21:45     michaelni       ubitux, the libav code refered to is wrong for us and i doubt the problem it fixes applies to us.
2017-04-29 13:24:29     @ubitux michaelni: ok, for both commits?
2017-04-29 13:33:55     michaelni       yes, they do more or less the same thing

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-29 13:49:06 +02:00
compat Support building C++ files with MSVC 2017-04-13 23:57:31 +02:00
doc doc/filters: add one lowpass filter example 2017-04-29 11:44:21 +02:00
libavcodec libvpxenc: allow aq-mode 4 (equator360) 2017-04-28 17:56:09 -07:00
libavdevice Merge commit '0fea8555ae25124c21f4c4f55a5fa76e9169aa03' 2017-04-26 17:17:50 +02:00
libavfilter avfilter/lavfutils: use image2pipe demuxer on ff_load_image 2017-04-29 01:23:25 +07:00
libavformat Merge commit '46191a2da16f751e53d93646ae1388d421d12bee' 2017-04-29 12:46:48 +02:00
libavresample Merge commit 'a1d9de304fe63614e3aa8117fef17491fa80093d' 2017-04-03 20:41:16 +02:00
libavutil Merge commit '05a603a94e4b3eeefa5e18ae653a848001461e89' 2017-04-26 16:27:24 +02:00
libpostproc Merge commit 'ea7ee4b4e381e0fa731458de0cbf740430eeb013' 2017-04-26 16:23:28 +02:00
libswresample Bump versions for master after 3.3 2017-04-02 19:54:12 +02:00
libswscale Merge commit 'ea7ee4b4e381e0fa731458de0cbf740430eeb013' 2017-04-26 16:23:28 +02:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests fate/exr : fix pix_fmt 2017-04-25 12:12:57 +02:00
tools tools/target_dec_fuzzer: Fix return code on open failure 2017-04-27 04:25:31 +02:00
.gitattributes fate: add SCC test 2017-01-27 17:06:42 +01:00
.gitignore Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1' 2016-06-26 15:43:05 +02:00
.travis.yml Merge commit 'eda183287489b2c705843aa373a19c4e46fb2fec' 2015-11-22 17:12:24 +00:00
arch.mak mips: rename mipsdspr1 to mipsdsp 2015-12-04 02:35:42 +01:00
Changelog Merge commit '1783d7ec03d730c5bd96c07bc5fa7aa566f85c66' 2017-04-29 12:43:37 +02:00
cmdutils_common_opts.h cmdutils: add show_demuxers and show_muxers 2016-11-08 01:56:31 +01:00
cmdutils_opencl.c cmdutils_opencl: fix resource_leak cid 1396852 2017-01-13 07:54:49 +08:00
cmdutils.c avformat, ffmpeg: deprecate old rotation API 2017-03-27 13:20:27 +02:00
cmdutils.h cmdutils: add show_demuxers and show_muxers 2016-11-08 01:56:31 +01:00
common.mak Merge commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c' 2017-04-17 09:39:31 +02:00
configure Merge commit 'ee480790c7eeb03c9cebd8971c46e0cb7db65277' 2017-04-26 17:15:07 +02:00
CONTRIBUTING.md Add CONTRIBUTING.md 2016-09-18 10:02:13 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_cuvid.c ffmpeg_cuvid: adapt for recent filter graph initialization changes 2017-03-03 08:45:43 +01:00
ffmpeg_dxva2.c Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28' 2016-06-26 15:34:01 +02:00
ffmpeg_filter.c ff*: do not use AVFrame accessor 2017-04-23 14:43:31 +07:00
ffmpeg_opt.c Merge commit '01348e411f962f5e4605d649fc9a47a54587ba8e' 2017-03-31 16:46:00 -03:00
ffmpeg_qsv.c ffmpeg: init filtergraphs only after we have a frame on each input 2017-03-03 08:45:43 +01:00
ffmpeg_vaapi.c ffmpeg_vaapi: Always set hwaccel_ctx, so it gets properly cleaned up on error 2017-02-05 15:13:15 +00:00
ffmpeg_vdpau.c Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6' 2016-06-26 15:29:39 +02:00
ffmpeg_videotoolbox.c ffmpeg_videotoolbox: fix usage of av_get_codec_tag_string() 2017-03-29 14:49:29 +02:00
ffmpeg.c ffmpeg: do not report EOF on filters as an error. 2017-04-23 14:22:22 +02:00
ffmpeg.h avformat, ffmpeg: deprecate old rotation API 2017-03-27 13:20:27 +02:00
ffplay.c ff*: do not use AVFrame accessor 2017-04-23 14:43:31 +07:00
ffprobe.c ff*: do not use AVFrame accessor 2017-04-23 14:43:31 +07:00
ffserver_config.c ffserver_config: Check for failure to allocate FFServerIPAddressACL 2016-12-22 19:23:08 +01:00
ffserver_config.h ffsrever: Make the status page bitexact if any stream is bitexact 2016-11-29 19:26:26 +01:00
ffserver.c ffserver: local OOB write with custom program name 2017-01-08 03:50:56 +01:00
INSTALL.md
library.mak Merge commit '3794062ab1a13442b06f6d76c54dce51ffa54697' 2017-04-09 14:52:00 +02:00
LICENSE.md Merge commit '4fef648d10bf3bcfd4b8fa5755c1128966a2427c' 2017-03-15 22:07:47 +01:00
MAINTAINERS MAINTAINERS: Add Rodger Combs to ffmpeg-security 2017-02-28 01:13:52 +01:00
Makefile Make tools/target_dec_*_fuzzer buildable with configure and make 2017-04-24 23:17:47 +02:00
README.md Add CONTRIBUTING.md 2016-09-18 10:02:13 +01:00
RELEASE Bump minor versions for master after release/3.3 branchpoint 2017-03-31 13:21:06 +02:00
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 and will be ignored.