ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-10 16:15:39 +01:00

Go to file

Michael Niedermayer 4adc8a29a0 Merge commit '74a9a624c5c4d50760d8d57458eba57366f6cb26'

* commit '74a9a624c5c4d50760d8d57458eba57366f6cb26':
  vcr1: return a meaningful error code.
  rpza: return a meaningful error code.
  qdrw: cosmetics, reformat

Conflicts:
	libavcodec/qdrw.c

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

2013-01-14 15:17:16 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'

2013-01-14 13:29:00 +01:00

libavcodec

Merge commit '74a9a624c5c4d50760d8d57458eba57366f6cb26'

2013-01-14 15:17:16 +01:00

libavdevice

Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1'

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

libavfilter

Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de'

2013-01-14 14:43:32 +01:00

libavformat

rtmpproto: Fix assignments in if()

2013-01-14 05:05:42 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2013-01-09 12:30:14 +01:00

libavutil

Merge remote-tracking branch 'qatar/master'

2013-01-12 13:42:42 +01:00

libpostproc

build: postproc cleanup.

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

libswresample

swr/dither: fix division by 0

2013-01-14 02:57:00 +01:00

libswscale

Merge remote-tracking branch 'qatar/master'

2013-01-05 13:37:30 +01:00

presets

…

tests

Merge commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8'

2013-01-13 13:54:52 +01:00

tools

Fix "knwon" typo and add a check in tools/patcheck

2013-01-04 19:24:37 +00: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 '44e065d56c87d6a9d0effccec5f31517f72924ec'

2013-01-14 13:29:00 +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 2013

2013-01-03 13:35:12 +02: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 '246da0b13551b1f80f067e4f258e5bd691f5ab33'

2013-01-14 14:00:21 +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

doc/ffmpeg: extend documentation for the -filter options and -af/vf aliases

2013-01-13 15:09:09 +01:00

ffmpeg.c

add note on windows pipe

2013-01-06 17:47:49 +01:00

ffmpeg.h

Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

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

ffplay.c

ffplay: fix sws_flags

2013-01-13 22:48:28 +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 89.8%

Assembly 8.2%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%