ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-24 15:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,671 Commits 36 Branches 398 Tags 538 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
e13134c730
Go to file
Clément Bœsch e13134c730 Merge commit '3399a26d3f57d462e839c0ee51223ae9aca20852' 
* commit '3399a26d3f57d462e839c0ee51223ae9aca20852':
  nvenc: allow setting the number of slices
  nvenc: De-compensate aspect ratio compensation of DVD-like content.
  nvenc: list the major contributors in the copyright header
  configure: Don't require nonfree for nvenc
  nvenc: drop the hard dependency on CUDA
  nvenc: only support HW frames when CUDA is enabled
  nvenc: write the VUI signal properties for HEVC
  nvenc: only write the VUI signal type fields if they are set
  nvenc: Generate bufferingPeriod/pictureTiming SEI
  nvenc: Delay frame output to increase encoding speed
  nvenc: add support for lossless encoding
  nvenc: Generate AUD NAL units for better compatiblity
  nvenc: fix the rc option definitions

All these commits are noop as requested by Timo Rothenpieler.

<BtbN> andrey_turkin, ubitux, yeah, I like the current state of nvenc in
ffmpeg, I think most remaining differences should be merged on the libav
side of things. At least I'm not aware of anything that's missing in
ffmpeg.

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-25 11:58:36 +02:00
compat
doc Merge commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca' 2016-06-23 15:59:44 +02:00
libavcodec Merge commit 'd68fb1475856cf93199e2bc4eee3063902c35df7' 2016-06-25 11:42:57 +02:00
libavdevice dshow: avoid duplicate NULL check before free 2016-06-23 03:18:16 +02:00
libavfilter avfilter/showcqt: set some frame properties 2016-06-24 15:33:16 +07:00
libavformat movenc: mark astronomical_body const string as static 2016-06-25 10:30:28 +02:00
libavresample Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 2016-06-22 13:44:34 +02:00
libavutil Merge commit 'ded4a6543dfb5a2f1d9f7fb8d3ab27a1872c22b3' 2016-06-24 11:16:52 +02:00
libpostproc
libswresample swr: fix time.h include 2016-06-22 14:00:08 +02:00
libswscale Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 2016-06-22 13:44:34 +02:00
presets
tests fate: add anequalizer test 2016-06-24 14:54:06 +02:00
tools Merge commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8' 2016-06-23 12:14:45 +02:00
.gitattributes
.gitignore Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 2016-06-22 13:44:34 +02:00
.travis.yml
arch.mak
Changelog avcodec: remove libutvideo wrapper support 2016-06-23 13:04:11 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak lavd/decklink: Fix compile issue on OS X 2016-06-24 21:59:43 -04:00
configure Merge commit '85ce9636e42dbda06b7d0af76a528a64b113fb3a' 2016-06-25 11:32:26 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_cuvid.c
ffmpeg_dxva2.c Merge commit 'b23613268c6b56a8f9de7859562d82b4b88353d9' 2016-06-22 23:36:37 +02:00
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_qsv.c
ffmpeg_vaapi.c Merge commit '0c1d66a07917602303f129f5a5651faeec2415d5' 2016-06-21 22:22:51 +02:00
ffmpeg_vdpau.c
ffmpeg_videotoolbox.c
ffmpeg.c Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 2016-06-21 21:55:34 +02:00
ffmpeg.h
ffplay.c Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 2016-06-21 21:55:34 +02:00
ffprobe.c ffprobe: print stereo3d information 2016-06-23 13:48:14 +02:00
ffserver_config.c
ffserver_config.h
ffserver.c
INSTALL.md
library.mak Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 2016-06-22 13:44:34 +02:00
LICENSE.md avcodec: remove libutvideo wrapper support 2016-06-23 13:04:11 +02:00
MAINTAINERS MAINTAINERS: purge a bunch of entries 2016-06-23 19:25:19 +02:00
Makefile
README.md
RELEASE
version.sh

README.md

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.