generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
73,550 Commits 24 Branches 241 Tags 173 MiB
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%
7da1f00e79
Go to file
Michael Niedermayer 7da1f00e79 Merge commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d' 
* commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d':
  mp3: Make the seek more robust

Conflicts:
	libavformat/mp3dec.c

Mostly not merged

See: b6267901c4 and various later commits

The bug is also not reproducable in FFmpeg

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-12 16:01:31 +02:00
compat compat/os2threads: Check av_malloc() return code 2015-06-02 15:16:45 +02:00
doc Merge commit '8fcd121b823caeadbe7597c9ae9229f6f164f949' 2015-07-09 12:11:10 +02:00
libavcodec Merge commit '355864ef7a9548ee6491a25de1e0650bd983a667' 2015-07-12 15:08:30 +02:00
libavdevice Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3' 2015-07-11 12:25:03 +02:00
libavfilter vf_psnr: fix rgb channel order mixup in final log message. 2015-07-11 19:13:57 +02:00
libavformat Merge commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d' 2015-07-12 16:01:31 +02:00
libavresample Merge commit 'd68c05380cebf563915412182643a8be04ef890b' 2015-06-01 00:22:47 +02:00
libavutil avutil/mem: Fix potential overflow in overallocation code 2015-07-11 22:47:09 +02:00
libpostproc postproc: fix unaligned access 2015-06-19 01:47:59 +02:00
libswresample swr: Remember previously set int_sample_format from user 2015-06-22 18:34:39 +02:00
libswscale YUV->BGR32 MMX support 2015-07-04 00:03:45 +02:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests fate: add tests for w3fdif filter 2015-07-11 19:34:04 +00:00
tools Merge commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d' 2015-06-12 22:46:10 +02:00
.gitattributes Treat all '*.pnm' files as non-text file 2014-11-28 17:52:43 -05:00
.gitignore Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89' 2015-07-03 03:22:48 +02:00
arch.mak use mmi instead of loongson3 as simd-optimization flag 2015-07-07 03:46:57 +02:00
Changelog Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02' 2015-07-09 11:53:14 +02:00
cmdutils_common_opts.h opts: add list device sources/sinks options 2014-10-25 20:20:31 +02:00
cmdutils_opencl.c OpenCL: Avoid potential buffer overflow in cmdutils_opencl.c 2015-04-28 12:18:23 +02:00
cmdutils.c lavu: add an API function to return the Libav version string 2015-07-02 23:22:53 +02:00
cmdutils.h ffplay&cmdutils:Factor get_rotation() code out 2015-05-03 23:49:16 +02:00
common.mak x86: Makefile: fix DBG parameter evaluation 2015-03-11 01:54:07 +01:00
configure libavcodec: Implementation of AAC_fixed_decoder (LC-module) [4/4] 2015-07-09 14:41:41 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_dxva2.c ffmpeg_dxva2: call GetDesktopWindow() in place of GetShellWindow() 2015-06-03 16:25:08 +02:00
ffmpeg_filter.c ffmpeg_filter: log more information on failure to init simple filter graph 2015-07-02 04:56:10 +02:00
ffmpeg_opt.c ffmpeg_opt: allow the user to ignore unused stream maps 2015-07-06 15:40:13 +02:00
ffmpeg_vda.c Merge commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9' 2015-07-09 12:19:34 +02:00
ffmpeg_vdpau.c Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec' 2014-12-27 13:26:38 +01:00
ffmpeg.c ffmpeg: Use av_log to print benchmark output. 2015-07-09 19:58:22 +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: make statement block unconditional by exiting early 2015-06-24 19:17:51 -03:00
INSTALL.md INSTALL: add markdown syntax 2014-05-28 22:38:38 +02:00
library.mak build: add LDLIBFLAGS 2015-07-08 14:35:02 +02:00
LICENSE.md LICENSE.md: add *_rect filters 2015-05-03 01:43:30 +02:00
MAINTAINERS MAINTAINERS: add myself as hls encryption maintainer 2015-06-16 16:52:38 +02:00
Makefile use mmi instead of loongson3 as simd-optimization flag 2015-07-07 03:46:57 +02:00
README.md README: add ffserver 2015-02-12 11:59:22 +01:00
RELEASE RELEASE: update to 2.6.git 2015-03-08 18:59:57 -03: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 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.