ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-28 15:19:38 +03:00

Go to file

Michael Niedermayer fdcdfb36b7 Merge commit 'ca14a2d0e40720d018421e06995737e5682c33c9' into release/1.1

* commit 'ca14a2d0e40720d018421e06995737e5682c33c9':
  configure: Use the right pkgconf file for openjpeg

Conflicts:
	configure

See: 182c674f68
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-04-21 17:23:59 +02:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

doc

Merge commit 'd791e8c990a752435d993df01516ebe469d94535' into release/1.1

2014-04-21 14:20:35 +02:00

libavcodec

Merge commit '85b8b169175a55fc862e01ecc96f649374bc14d2' into release/1.1

2014-04-21 17:06:03 +02:00

libavdevice

avdevice/v4l2: only use average frame rate if set

2014-03-07 04:04:07 +01:00

libavfilter

Merge commit 'ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1' into release/1.1

2014-04-21 16:42:24 +02:00

libavformat

Merge commit 'b77819afbc44016143b4a11b46109625203c4cef' into release/1.1

2014-04-21 17:14:17 +02:00

libavresample

Merge commit 'dccac759d39e761398d3d4172ae0b98c0186efa5' into release/1.1

2014-04-21 17:13:58 +02:00

libavutil

avutil/log: skip IO calls on empty strings

2014-03-07 04:04:07 +01:00

libpostproc

build: postproc cleanup.

2012-12-30 02:27:52 +01:00

libswresample

swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output

2013-08-20 18:45:21 +02:00

libswscale

Merge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1

2013-05-12 14:31:59 +02:00

presets

…

tests

Merge commit '56eded8bc7bccdf14245bae3a45b0fecf9d9d122' into release/1.1

2013-12-21 02:31:41 +01:00

tools

Merge commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180' into release/1.1

2014-04-21 13:32:22 +02:00

.gitignore

Add examples/resampling_audio to .gitignore.

2012-12-06 12:13:01 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

2012-12-20 02:38:18 +01:00

cmdutils.c

cmdutils: update copyright year to 2014.

2014-04-14 16:55:37 -04:00

cmdutils.h

cmdutils: avtool -> fftool

2013-05-13 00:45:09 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

configure

configure: Special case libfreetype test

2014-04-21 14:05:30 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

ffmpeg: sub2video: set resample size.

2013-01-01 23:06:34 +01:00

ffmpeg_opt.c

ffmpeg: dont allow -flags to override -pass

2013-02-06 02:03:05 +01:00

ffmpeg.c

Merge commit 'fa6eef4210c2fd7f7324d558b09311c75987a31e' into release/1.1

2013-08-27 16:30:57 +02:00

ffmpeg.h

Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

2012-12-20 02:38:02 +01:00

ffplay.c

Replace references to "que" with the appropriate word.

2013-01-03 00:21:47 +01:00

ffprobe.c

ffprobe: do not escape '"' between single quotes.

2013-01-01 13:32:51 +01:00

ffserver.c

ffserver: strip odd chars from html error messages before sending them back

2013-10-09 00:55:38 +02:00

INSTALL

…

library.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

LICENSE

lavfi: add histeq filter

2013-01-05 10:25:32 +01:00

MAINTAINERS

MAINTAINERS: mention that people are welcome to pick up and maintain older releases

2013-03-18 03:35:47 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

README

…

RELEASE

Prepare for 9.13 Release

2014-03-29 13:12:15 -04:00

VERSION

update for 1.1.9

2014-03-07 04:14:03 +01: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.

Description

FFmpeg - это набор библиотек и инструментов для обработки мультимедийного контента, такого как аудио, видео, субтитры и связанные с ними метаданные

https://ffmpeg.org/

audio converter video

Readme 437 MiB

Languages

C 88.6%

Assembly 8.3%

Makefile 1.6%

GLSL 0.4%

C++ 0.3%

Other 0.6%