ffmpeg

Go to file

Michael Niedermayer 41135b7f64 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: add option for dithering during sample format conversion to s16
  mpeg12: do not decode extradata more than once.

Conflicts:
	libavcodec/mpeg12.c
	libavcodec/mpeg12.h

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

2012-12-20 12:18:28 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

doc/general: sort subtitles formats.

2012-12-20 03:55:16 +01:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-12-20 12:18:28 +01:00

libavdevice

dshow: call CoUninitialize() on dshow_read_close()

2012-12-17 03:44:51 -02:00

libavfilter

lavfi/select: fix compilation with avcodec disabled.

2012-12-20 05:17:36 +01:00

libavformat

Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

2012-12-20 12:06:15 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-12-20 12:18:28 +01:00

libavutil

Merge remote-tracking branch 'qatar/master'

2012-12-20 02:51:35 +01:00

libpostproc

pp: fix a few typo in the template.

2012-12-19 17:59:25 +01:00

libswresample

swr/doxy: fix missing quote in code example.

2012-12-16 21:04:54 +01:00

libswscale

doxy: add ref for lavfi, lpp and lsws.

2012-12-11 02:13:43 +01:00

presets

presets: specify the codecs.

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

tests

fate: add and fix subtitles dependencies.

2012-12-20 03:50:34 +01:00

tools

Fix "bistream" typo and add a check in tools/patcheck.

2012-12-18 02:47:34 +01: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

Changelog

Merge commit 'acb571c89a065d943163c11efb46de35774f1909'

2012-12-20 02:44:22 +01:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

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

cmdutils.c

Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

2012-12-20 12:06:15 +01:00

cmdutils.h

Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

2012-12-20 12:06:15 +01:00

common.mak

Merge remote-tracking branch 'qatar/master'

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

configure

Merge remote-tracking branch 'qatar/master'

2012-12-18 15:00:05 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'

2012-12-19 22:04:03 +01:00

ffmpeg_opt.c

Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

2012-12-20 12:06:15 +01:00

ffmpeg.c

Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

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

ffmpeg.h

Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

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

ffplay.c

ffplay: provide some feedback in case the codec cannot be set

2012-12-16 10:58:02 +01:00

ffprobe.c

ffprobe: show pkt_size in frame

2012-12-15 11:46:47 +01:00

ffserver.c

ffserver: set oformat

2012-12-09 23:39:06 +01:00

INSTALL

…

library.mak

Merge remote-tracking branch 'qatar/master'

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

LICENSE

lavfi: add geq filter.

2012-11-11 23:12:54 +01:00

MAINTAINERS

MAINTAINERS: update my GPG key fingerprint

2012-12-18 23:08:02 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

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

README

…

RELEASE

Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'

2012-10-24 14:01:36 +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.

Languages

C 90.4%

Assembly 7.7%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%