ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-30 06:28:25 +03:00

Go to file

Michael Niedermayer e2e9bee2da Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: Bump minor for JPEG 2000 decoder
  JPEG 2000 decoder for DCinema

The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/mqc.c
	libavcodec/mqc.h
	libavcodec/mqcdec.c
	libavcodec/version.h
	tests/fate/video.mak

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

2013-04-22 20:00:54 +02:00

compat

Provide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/.

2013-03-21 04:23:24 +01:00

doc

JPEG 2000 decoder for DCinema

2013-04-22 15:38:29 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2013-04-22 20:00:54 +02:00

libavdevice

avdevice/lavfi: add error checking for av_opt_set_int_list()

2013-04-12 20:39:07 +02:00

libavfilter

lavfi: remove mp=down3dright

2013-04-22 11:49:13 +00:00

libavformat

Merge commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a'

2013-04-22 18:33:37 +02:00

libavresample

Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

2013-03-28 11:20:41 +01:00

libavutil

lavu/opencl:optimize compile kernel operation

2013-04-22 15:07:54 +02:00

libpostproc

lavfi/pp: switch to an AVOptions-based system.

2013-04-10 23:16:03 +02:00

libswresample

swr/rematrix: use av_calloc()

2013-04-15 20:31:06 +02:00

libswscale

Fix libswscale compilation with --disable-optimizations on x86-32.

2013-04-18 12:47:16 +02:00

presets

presets: specify the codecs.

2012-05-04 18:40:36 +02:00

tests

Merge remote-tracking branch 'qatar/master'

2013-04-22 20:00:54 +02:00

tools

ismindex: check mkdir()s return code

2013-04-21 19:53:18 +02:00

.gitignore

Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

2013-04-06 13:23:38 +02:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

JPEG 2000 decoder for DCinema

2013-04-22 15:38:29 +02:00

cmdutils_common_opts.h

cmdutils_common_opts: fix indention of #if

2013-04-11 16:07:46 +02:00

cmdutils.c

cmdutils: make the "-help filter=" output less confusing

2013-04-18 13:03:00 +02:00

cmdutils.h

Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'

2013-04-12 15:56:20 +02:00

common.mak

Integrate lcov/gcov into Libav

2013-04-05 18:55:11 +02:00

configure

Merge commit '28bc406c84b04a5f1458b90ff52ddbec73e46202'

2013-04-20 13:21:18 +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

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_filter.c

ffmpeg_filter: fix leak on error

2013-04-21 11:59:34 +02:00

ffmpeg_opt.c

ffmpeg: make -aspect work with -vcodec copy.

2013-04-18 22:59:54 +02:00

ffmpeg.c

ffmpeg: make -aspect work with -vcodec copy.

2013-04-18 22:59:54 +02:00

ffmpeg.h

Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'

2013-04-11 23:50:39 +02:00

ffplay.c

ffplay: check av_samples_get_buffer_size() return

2013-04-21 18:56:18 +02:00

ffprobe.c

ffprobe: set writer context to 0 after allocation

2013-03-19 18:00:34 +01:00

ffserver.c

ffserver/ctime1: avoid using strcpy()

2013-03-25 23:31:34 +01:00

INSTALL

Merge remote branch 'qatar/master'

2011-04-08 02:50:13 +02:00

library.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

2013-03-28 12:12:38 +01:00

LICENSE

LICENSE: add libutvideo in the GPL libraries list.

2013-03-29 02:08:20 +01:00

MAINTAINERS

MAINTAINERS: add opencl maintainer

2013-04-11 13:42:07 +02:00

Makefile

Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

2013-04-06 13:23:38 +02:00

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

RELEASE

RELEASE: 1.1.git for master

2013-01-06 21:42:35 +01: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.

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%