mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00

Go to file

Michael Niedermayer e96ca404ea Merge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5'

* commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5':
  lavu: Add av_gettime_relative

Conflicts:
	libavutil/time.c
	libavutil/time.h
	libavutil/version.h

See: 0eec06ed87
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-10-24 11:06:56 +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

lavu: Add av_gettime_relative

2014-10-24 09:53:41 +03:00

libavcodec

avcodec/utils: Print the codec name that is missing on the whitelist

2014-10-23 23:30:41 +02:00

libavdevice

lavd/fbdev_common: report error during probing fbdev device

2014-10-21 22:57:32 +02:00

libavfilter

avfilter/vf_idet: Fixes issue with idet not flushing last frame.

2014-10-22 15:07:36 +02:00

libavformat

avformat/rtsp: pass return code from ffurl_open() on its failure

2014-10-23 23:53:14 +02:00

libavresample

Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'

2014-10-18 22:53:23 +02:00

libavutil

Merge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5'

2014-10-24 11:06:56 +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

Added STL demuxer and decoder

2014-10-22 23:12:38 +02:00

tools

tools/crypto_bench: add CAST5 support

2014-10-21 22:15:43 -03:00

.gitignore

gitignore: add test_copy.ffmeta

2014-10-17 15:57:12 +02:00

arch.mak

…

Changelog

Added STL demuxer and decoder

2014-10-22 23:12:38 +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

Print an error if -r and -vsync 0 are used together.

2014-10-23 23:27:46 +02:00

ffmpeg_vda.c

…

ffmpeg_vdpau.c

Merge commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd'

2014-10-06 16:31:51 +02:00

ffmpeg.c

ffmpeg: avoid endlessly reading from one input while another is unavailable

2014-10-22 22:26:32 +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_config.c

ffserver_conf: factorize parse function per config tag

2014-10-22 22:37:40 +02:00

ffserver_config.h

ffserver_conf: factorize parse function per config tag

2014-10-22 22:37:40 +02:00

ffserver.c

ffserver: move configuration code to separate file

2014-10-22 22:37:40 +02:00

INSTALL.md

…

library.mak

Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'

2014-07-22 02:45:45 +02:00

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

ffserver: move configuration code to separate file

2014-10-22 22:37:40 +02:00

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

version.sh: Print versions based on the last git tag for release branches

2014-07-28 15:44:59 +02:00

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 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.

Languages

C 89.9%

Assembly 8.1%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%