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
35,180 Commits 41 Branches 434 Tags
022f8d27dd0a61bfaae729d53d133b17418ea16b
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer 022f8d27dd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: Readd #define _SVID_SOURCE
  Fix av_get_channel_layout_string() for positions >31
  configure: Store vda lib flags in extralibs instead of ldflags
  Make channel layout masks unsigned
  dca: ARMv6 optimised decode_blockcode()
  nullenc: drop AVFMT_RAWPICTURE from the flags
  frame-mt: return consumed packet size in ff_thread_decode_frame
  aacdec: add more fate tests covering SBR and PS
  MK(BE)TAG: avoid undefined shifts

Conflicts:
	configure
	libavcodec/arm/dca.h
	libavcodec/dca.c
	libavcodec/mlp_parser.c
	libavcodec/version.h
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/defaults.c
	libavutil/audioconvert.c
	libavutil/avutil.h
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-26 01:12:08 +01:00
doc
Add option -n to exit if output file exists.
2011-11-24 21:42:42 +01:00
ffpresets
Merge remote-tracking branch 'qatar/master'
2011-10-20 02:34:51 +02:00
libavcodec
Merge remote-tracking branch 'qatar/master'
2011-11-26 01:12:08 +01:00
libavdevice
Merge remote-tracking branch 'qatar/master'
2011-11-26 01:12:08 +01:00
libavfilter
Merge remote-tracking branch 'qatar/master'
2011-11-26 01:12:08 +01:00
libavformat
Merge remote-tracking branch 'qatar/master'
2011-11-26 01:12:08 +01:00
libavutil
Merge remote-tracking branch 'qatar/master'
2011-11-26 01:12:08 +01:00
libpostproc
postproc: remove stray +
2011-10-30 18:11:09 +01:00
libswresample
swr: fix invalid sample format message.
2011-11-24 16:55:45 +01:00
libswscale
swscale: Readd #define _SVID_SOURCE
2011-11-25 19:59:15 +02:00
mt-work
Update todo
2011-06-12 18:01:29 +02:00
presets
Remove redundant libx264 preset files
2011-10-22 01:32:10 +02:00
tests
Merge remote-tracking branch 'qatar/master'
2011-11-26 01:12:08 +01:00
tools
patcheck: spelling and grammar nits
2011-11-23 02:03:10 +01:00
.gitignore
gitignore: add libswresample*
2011-09-19 17:39:38 +02:00
avconv.c
Add option -n to exit if output file exists.
2011-11-24 21:42:42 +01:00
Changelog
[PATCH] IFF Amiga Continuous Bitmap (ACBM)decoder
2011-11-21 23:06:53 +01:00
cmdutils_common_opts.h
cmdutils: Fix loglevel for -debug
2011-10-14 02:18:55 +02:00
cmdutils.c
Merge remote-tracking branch 'qatar/master'
2011-11-23 04:02:17 +01:00
cmdutils.h
Merge remote-tracking branch 'qatar/master'
2011-11-01 02:02:20 +01:00
common.mak
Add rule for compiling to asm
2011-10-22 20:49:24 +02:00
configure
Merge remote-tracking branch 'qatar/master'
2011-11-26 01:12:08 +01:00
COPYING.GPLv2
Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.
2009-06-05 09:51:31 +00:00
COPYING.GPLv3
Add configure option to upgrade (L)GPL to version 3.
2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1
Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.
2009-06-05 09:51:31 +00: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
doxygen: dont generate docs for avconv.c
2011-09-08 17:56:17 +02:00
ffmpeg.c
ffmpeg: Warn if output file is empty
2011-11-25 16:17:06 +01:00
ffplay.c
ffplay: Check for pix_fmt changes Fixes Ticket238 by not crashing but also not playing the file.
2011-11-21 20:20:48 +01:00
ffprobe.c
ffprobe: always print int values with print_val()
2011-11-25 13:25:56 +01:00
ffserver.c
ffserver: use av_noreturn
2011-11-11 04:25:53 +01:00
INSTALL
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
LICENSE
libaac+ support
2011-09-26 02:28:21 +02:00
MAINTAINERS
MAINTAINERS: add myself as a web site maintainer
2011-11-21 00:07:52 +01:00
Makefile
Merge remote-tracking branch 'qatar/master'
2011-10-20 02:34:51 +02:00
README
Revert "partially rename FFmpeg to Libav"
2011-03-17 17:26:45 +01:00
RELEASE
RELEASE: We're now at 0.8.7.git
2011-11-25 14:37:35 +01:00
subdir.mak
Add rule for compiling to asm
2011-10-22 20:49:24 +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.

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

* See the LICENSE 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%