sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-11-14 21:58:33 +03:00
Code Activity
44,327 Commits 41 Branches 434 Tags
bff2afb3e978c9cdffdd03a2571e4f6ddab74731
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer bff2afb3e9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: dsputil: Only compile motion_est code when encoders are enabled
  mem: fix typo in check for __ICC
  fate: mp3: drop redundant CMP setting
  rtp: Depacketization of JPEG (RFC 2435)
  Rename ff_put_string to avpriv_put_string
  mjpeg: Rename some symbols to avpriv_* instead of ff_*
  yadif: cosmetics

Conflicts:
	Changelog
	libavcodec/mjpegenc.c
	libavcodec/x86/Makefile
	libavfilter/vf_yadif.c
	libavformat/version.h
	libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10 14:06:20 +02:00
compat
Merge remote-tracking branch 'qatar/master'
2012-09-06 16:23:17 +02:00
doc
lavd/dshow: support video codec and pixel format selection
2012-09-07 09:59:12 +02:00
libavcodec
Merge remote-tracking branch 'qatar/master'
2012-09-10 14:06:20 +02:00
libavdevice
dshow: Change WINBOOL to BOOL
2012-09-07 22:23:32 +02:00
libavfilter
Merge remote-tracking branch 'qatar/master'
2012-09-10 14:06:20 +02:00
libavformat
Merge remote-tracking branch 'qatar/master'
2012-09-10 14:06:20 +02:00
libavresample
Merge remote-tracking branch 'qatar/master'
2012-09-09 13:27:42 +02:00
libavutil
mem: fix typo in check for __ICC
2012-09-10 00:07:26 +01:00
libpostproc
rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT
2012-08-20 17:47:25 +02:00
libswresample
swr: add av_cold to init/free functions
2012-09-09 02:26:20 +02:00
libswscale
Merge remote-tracking branch 'qatar/master'
2012-09-09 13:27:42 +02:00
mt-work
Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
2012-08-07 22:45:46 +02:00
presets
presets: specify the codecs.
2012-05-04 18:40:36 +02:00
tests
Merge remote-tracking branch 'qatar/master'
2012-09-10 14:06:20 +02:00
tools
Merge remote-tracking branch 'qatar/master'
2012-08-31 13:34:32 +02:00
.gitignore
gitignore: codec_names.h is no more
2012-09-07 14:59:01 +02:00
arch.mak
Optimization of AMR NB and WB decoders for MIPS
2012-06-11 21:12:39 +02:00
Changelog
Merge remote-tracking branch 'qatar/master'
2012-09-10 14:06:20 +02:00
cmdutils_common_opts.h
cmdutils: add -layouts option.
2012-08-28 15:09:49 +02:00
cmdutils.c
Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'
2012-08-31 13:01:30 +02:00
cmdutils.h
Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'
2012-08-31 13:01:30 +02:00
common.mak
Merge remote-tracking branch 'qatar/master'
2012-08-30 17:28:21 +02:00
configure
Merge remote-tracking branch 'qatar/master'
2012-09-09 13:27:42 +02:00
COPYING.GPLv2
…
COPYING.GPLv3
Add configure option to upgrade (L)GPL to version 3.
2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1
cosmetics: Delete empty lines at end of file.
2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
Add configure option to upgrade (L)GPL to version 3.
2009-06-05 11:04:03 +00:00
CREDITS
Revert "partially rename FFmpeg to Libav"
2011-03-17 17:26:45 +01:00
Doxyfile
Merge remote-tracking branch 'qatar/master'
2012-08-04 23:51:43 +02:00
ffmpeg_filter.c
ffmpeg_filter: fix unsafe snprintf() usage
2012-09-09 14:11:03 +02:00
ffmpeg_opt.c
Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'
2012-08-31 13:01:30 +02:00
ffmpeg.c
Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'
2012-08-31 13:01:30 +02:00
ffmpeg.h
Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'
2012-08-31 13:01:30 +02:00
ffplay.c
Merge remote-tracking branch 'cus/stable'
2012-09-01 14:59:08 +02:00
ffprobe.c
ffprobe: simplify default printer
2012-09-10 10:22:36 +02:00
ffserver.c
ffserver: fix unsafe snprintf() return usage.
2012-09-09 14:10:11 +02:00
INSTALL
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
library.mak
Merge remote-tracking branch 'qatar/master'
2012-08-30 17:28:21 +02:00
LICENSE
LICENSE: correct incorrect claims on *GPL incompatibility
2012-08-16 04:47:18 +02:00
MAINTAINERS
Add CPiA video decoder
2012-08-31 00:24:11 +02:00
Makefile
Makefile: remove old codec_names.h on distclean
2012-09-07 14:59:01 +02:00
README
README: be a tiny bit more verbose
2012-04-06 10:23:26 +02:00
RELEASE
RELEASE: update, seem this has been forgotten
2012-07-01 21:21:07 +02:00
version.sh
version.sh: handle shallow clones and snapshots.
2011-07-22 10:43:59 +02: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 452 MiB
Languages
C 88.6%
Assembly 8.3%
Makefile 1.6%
GLSL 0.4%
C++ 0.3%
Other 0.6%