FFmpeg

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

Go to file

Michael Niedermayer 766f055201 Merge commit '4af5310d29379283553bcd9f541a3f6c317f706e'

* commit '4af5310d29379283553bcd9f541a3f6c317f706e':
  get_bits/put_bits: K&R formatting cosmetics

Conflicts:
	libavcodec/get_bits.h
	libavcodec/put_bits.h

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

2013-01-22 13:49:45 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

doc: document aresample:first_pts

2013-01-22 01:38:55 +01:00

libavcodec

Merge commit '4af5310d29379283553bcd9f541a3f6c317f706e'

2013-01-22 13:49:45 +01:00

libavdevice

Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'

2013-01-18 13:36:39 +01:00

libavfilter

avf_showwaves: fix null pointer dereference

2013-01-21 23:00:20 +01:00

libavformat

Merge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'

2013-01-22 13:38:20 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

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

libavutil

Merge remote-tracking branch 'qatar/master'

2013-01-19 13:20:25 +01:00

libpostproc

build: postproc cleanup.

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

libswresample

swr: support first_pts

2013-01-21 00:52:14 +01:00

libswscale

sws: check that dither array is not null before memset

2013-01-19 23:38:17 +01:00

presets

presets: specify the codecs.

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

tests

Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'

2013-01-21 16:28:04 +01:00

tools

tools: add plotframes script

2013-01-15 22:50:19 +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

afade filter

2013-01-21 15:20:42 +00:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

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

cmdutils.c

cmdline: fix -- to escape files starting with -

2013-01-19 14:50:36 +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 remote-tracking branch 'qatar/master'

2013-01-21 16:34:37 +01: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

Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d'

2013-01-15 15:32:48 +01:00

ffmpeg.c

Merge commit 'd9bf716945046333c24580d538f450b516f15710'

2013-01-21 14:10:32 +01:00

ffmpeg.h

Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

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

ffplay.c

ffplay: flush video filters on seek

2013-01-19 00:48:06 +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

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: 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

…

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%