sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-11-08 11:07:56 +03:00
Code Activity
61,869 Commits 41 Branches 434 Tags
12ab07be447264b107b18bc49bb9e06be072330f
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer 12ab07be44 Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b' 
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b':
  Alias PIX image encoder and decoder

Conflicts:
	Changelog
	libavcodec/allcodecs.c
	libavcodec/version.h
	libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 01:10:28 +01:00
compat
Merge remote-tracking branch 'qatar/master'
2014-03-10 12:05:02 +01:00
doc
Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'
2014-03-27 01:10:28 +01:00
libavcodec
Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'
2014-03-27 01:10:28 +01:00
libavdevice
dshow: log error and continue if unable to set audio buffer
2014-03-25 17:32:39 +01:00
libavfilter
avfilter/vf_pullup: add comment to explain memset(0)
2014-03-26 20:05:57 +01:00
libavformat
Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'
2014-03-27 01:10:28 +01:00
libavresample
Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'
2014-03-26 14:50:55 +01:00
libavutil
avutil/frame: undeprecate AVFrame.motion_val API
2014-03-26 18:22:49 +01:00
libpostproc
Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.
2014-03-18 23:39:30 +01:00
libswresample
swresample/resample: sse float linear interpolation
2014-03-24 02:34:02 +01:00
libswscale
Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'
2014-03-26 14:50:55 +01:00
presets
presets: specify the codecs.
2012-05-04 18:40:36 +02:00
tests
fate: add tests for linearly interpolated resampling
2014-03-24 04:25:44 +01:00
tools
tools: add dvd2concat.
2014-03-23 19:15:07 +01:00
.gitignore
Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'
2014-02-25 20:26:00 +01:00
arch.mak
Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'
2014-03-13 22:35:47 +01:00
Changelog
Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'
2014-03-27 01:10:28 +01:00
cmdutils_common_opts.h
Allow hiding the banner.
2013-12-29 22:57:20 +01:00
cmdutils_opencl.c
cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
2013-12-09 21:21:36 +01:00
cmdutils.c
avconv: Match stream id
2014-03-13 11:59:34 +01:00
cmdutils.h
Allow hiding the banner.
2013-12-29 22:57:20 +01:00
common.mak
Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
2014-02-17 02:22:01 +01:00
configure
Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'
2014-03-24 20:55:23 +01: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_filter.c
Merge remote-tracking branch 'qatar/master'
2013-11-24 05:21:19 +01:00
ffmpeg_opt.c
ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams
2014-03-16 15:15:02 +01:00
ffmpeg_vdpau.c
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
2013-11-23 14:46:48 +01:00
ffmpeg.c
Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'
2014-03-25 19:25:10 +01:00
ffmpeg.h
Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'
2014-03-24 16:40:35 +01:00
ffplay.c
ffplay: display information on stream cycling
2014-03-12 00:32:38 +01:00
ffprobe.c
ffprobe: check av_frame_alloc() failure.
2013-12-30 10:58:01 +01:00
ffserver.c
ffserver: merge RTSP's teardown & pause routines
2014-02-14 14:31:42 -03:00
INSTALL
…
library.mak
Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
2014-02-17 02:22:01 +01:00
LICENSE
Add libx265 encoder
2014-02-12 13:13:17 +00:00
MAINTAINERS
lavu: add myself as dynarray.h maintainer.
2014-03-23 19:17:20 +01:00
Makefile
Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'
2014-03-13 22:35:47 +01:00
README
README: be a tiny bit more verbose
2012-04-06 10:23:26 +02:00
RELEASE
Prepare for 11_alpha1 Release
2014-03-13 08:24:11 -04:00
version.sh
version.sh: add preprocessing guards
2013-11-30 21:42:03 +01:00

README 

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.
View Git Blame Copy Permalink
Description
FFmpeg - это набор библиотек и инструментов для обработки мультимедийного контента, такого как аудио, видео, субтитры и связанные с ними метаданные
https://ffmpeg.org/
audioconvertervideo
Readme 447 MiB
Languages
C 88.6%
Assembly 8.3%
Makefile 1.6%
GLSL 0.4%
C++ 0.3%
Other 0.6%