sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-11-09 23:48:13 +03:00
Code Activity
54,793 Commits 41 Branches 434 Tags
9d01bf7d66df74fe58d71b7e93e86895270a91c2
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer 9d01bf7d66 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Consistently use "cpu_flags" as variable/parameter name for CPU flags

Conflicts:
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/h264dsp_init.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/motion_est.c
	libavcodec/x86/mpegvideo.c
	libavcodec/x86/proresdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-18 09:53:47 +02:00
compat
Merge remote-tracking branch 'qatar/master'
2013-07-05 13:11:06 +02:00
doc
doc/filters: update/correct mp documentation
2013-07-17 09:34:05 +02:00
libavcodec
Merge remote-tracking branch 'qatar/master'
2013-07-18 09:53:47 +02:00
libavdevice
avdevice/lavfi: fix input with unknown channel layout
2013-07-13 23:10:05 +02:00
libavfilter
Merge remote-tracking branch 'qatar/master'
2013-07-18 09:53:47 +02:00
libavformat
Merge https://github.com/lukaszmluki/ffmpeg
2013-07-18 01:40:49 +02:00
libavresample
Merge remote-tracking branch 'qatar/master'
2013-07-18 09:53:47 +02:00
libavutil
Merge remote-tracking branch 'qatar/master'
2013-07-18 09:53:47 +02:00
libpostproc
postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q"
2013-06-16 18:21:39 +02:00
libswresample
cosmetics: Fix "dont" "wont" "doesnt" typos
2013-06-29 02:31:16 +02:00
libswscale
swscale/options: fix copy and paste typo
2013-07-17 16:59:29 +02:00
presets
presets: specify the codecs.
2012-05-04 18:40:36 +02:00
tests
lavf/matroskaenc: Check for valid metadata before creating tags
2013-07-17 12:18:27 +02:00
tools
Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'
2013-07-07 11:35:59 +02:00
.gitignore
Rename ffadler to ffhash and expand it using the generic hash API
2013-05-16 17:58:56 +02:00
arch.mak
Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'
2012-12-08 14:24:16 +01:00
Changelog
lavfi: port perspective filter from libmpcodecs
2013-07-14 16:27:17 +00:00
cmdutils_common_opts.h
cmdutils_common_opts: fix indention of #if
2013-04-11 16:07:46 +02:00
cmdutils.c
cmdutils: replace exit() by exit_program()
2013-07-08 11:12:32 +02:00
cmdutils.h
Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'
2013-07-08 04:34:11 +02:00
common.mak
Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'
2013-03-28 12:12:38 +01:00
configure
lavfi: port perspective filter from libmpcodecs
2013-07-14 16:27:17 +00:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
CREDITS: redirect to Git log, remove current outdated content
2013-01-31 18:02:52 +01:00
ffmpeg_filter.c
ffmpeg_filter: replace exit() by exit_program()
2013-07-08 11:09:22 +02:00
ffmpeg_opt.c
ffmpeg_opt: do not warn about unused gop_timecode
2013-07-09 10:54:40 +02:00
ffmpeg.c
Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'
2013-07-08 04:34:11 +02:00
ffmpeg.h
ffmpeg: add -apad option which injects a apad filter only in the presence of video streams
2013-05-08 23:55:06 +02:00
ffplay.c
ffplay: remove explicit idct option
2013-07-13 15:01:05 +02:00
ffprobe.c
Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'
2013-07-08 04:34:11 +02:00
ffserver.c
ffserver: fix null pointer dereference
2013-06-04 13:19:27 +02:00
INSTALL
…
library.mak
Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'
2013-03-28 12:12:38 +01:00
LICENSE
lavfi: port perspective filter from libmpcodecs
2013-07-14 16:27:17 +00:00
MAINTAINERS
MAINTAINERS: drop 1.1 from the releases that i maintain
2013-07-15 02:30:36 +02:00
Makefile
Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'
2013-05-24 13:01:41 +02:00
README
README: be a tiny bit more verbose
2012-04-06 10:23:26 +02:00
RELEASE
Update for 2.0
2013-07-10 02:15:43 +02:00
version.sh
…

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 448 MiB
Languages
C 88.6%
Assembly 8.3%
Makefile 1.6%
GLSL 0.4%
C++ 0.3%
Other 0.6%