FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00

Go to file

Michael Niedermayer f2b89f21cc Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551'

* commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551':
  sws: dont enable chrSrcHSubSample for planar RGB

Conflicts:
	libswscale/utils.c

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

2013-02-10 14:07:27 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

lavfi: remove mp=il filter

2013-02-09 21:43:39 +00:00

libavcodec

Merge commit '36fab50e90d15352e403e4cc210890810f2fb4e2'

2013-02-10 12:14:14 +01:00

libavdevice

dshow: allow for more codec ID's

2013-01-16 00:23:53 -07:00

libavfilter

lavfi/il: move query_formats() definition up

2013-02-10 14:00:19 +01:00

libavformat

Merge commit '81726a4f0b8a43e19898e2a36fdde80583bafff0'

2013-02-10 13:18:04 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2013-01-18 13:54:38 +01:00

libavutil

Call the common 7.1 wide channel layout "7.1(wide)".

2013-02-09 18:14:46 +01:00

libpostproc

Fix libpostproc compilation on x86_32 with disable-optimizations.

2013-02-09 15:03:04 +01:00

libswresample

swr: Dont use floats for S32->S32 when possible

2013-02-04 04:11:46 +01:00

libswscale

Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551'

2013-02-10 14:07:27 +01:00

presets

presets: specify the codecs.

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

tests

Merge commit '81726a4f0b8a43e19898e2a36fdde80583bafff0'

2013-02-10 13:18:04 +01:00

tools

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

.gitignore

.gitignore: add /doc/examples/pc-uninstalled

2013-01-17 17:59:18 +00:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419'

2013-02-10 13:06: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

Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d'

2013-02-06 15:57:45 +01:00

cmdutils.h

lavf: remove nonexistent symbols

2013-01-11 10:07:52 +00:00

common.mak

Merge remote-tracking branch 'qatar/master'

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

configure

Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'

2013-02-07 13:09:35 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

CREDITS: redirect to Git log, remove current outdated content

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

ffmpeg_filter.c

ffmpeg: support filtering of unknown channel layouts.

2013-01-26 11:15:38 +01:00

ffmpeg_opt.c

ffmpeg: dont allow -flags to override -pass

2013-02-06 01:26:26 +01:00

ffmpeg.c

ffmpeg: do not call exit from exit_program()

2013-02-06 04:03:52 +01:00

ffmpeg.h

ffmpeg: implement -force_key_frames expression evalution

2013-01-27 16:56:47 +01:00

ffplay.c

Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'

2013-02-10 12:47:37 +01:00

ffprobe.c

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

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

ffserver.c

ffserver: add missing padding to extradata.

2012-12-30 22:22:18 +01:00

INSTALL

…

library.mak

build: Remove superfluous MAKE variable for the build suffix

2013-02-03 13:08:36 +01:00

LICENSE

lavfi: add histeq filter

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

MAINTAINERS

MAINTAINERS: add 1.1, remove 0.10

2013-01-06 21:42:35 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01: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

…

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.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%