FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-09-16 08:36:51 +02:00

Go to file

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

* qatar/master:
  fate: Add FATE tests for the Ut Video encoder
  lavc: add Ut Video encoder
  mpegvideo_enc: remove stray duplicate line from 7f9aaa4
  swscale: x86: fix #endif comments in rgb2rgb template file
  avconv: mark more options as expert.
  avconv: split printing "main options" into global and per-file.
  avconv: refactor help printing.

Conflicts:
	Changelog
	ffmpeg_opt.c
	ffserver.c
	libavcodec/version.h

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

2012-08-20 17:31:55 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2012-08-17 17:06:52 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

libavdevice

dshow: protect access to curbufsize

2012-08-19 18:36:26 +02:00

libavfilter

lavfi: add volumedetect filter.

2012-08-19 11:37:05 +02:00

libavformat

lavc: move AVRn to a seperate decoder.

2012-08-20 02:46:09 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

libavutil

deprecate av_parse_cpu_flags

2012-08-16 22:04:46 +02:00

libpostproc

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

libswresample

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

libswscale

libswscale: fix #endif comments in rgb2rgb_template.c

2012-08-16 18:40:11 +02:00

mt-work

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

presets

presets: specify the codecs.

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

tests

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

tools

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

.gitignore

Merge remote-tracking branch 'qatar/master'

2012-08-09 00:51:02 +02:00

arch.mak

Optimization of AMR NB and WB decoders for MIPS

2012-06-11 21:12:39 +02:00

Changelog

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

cmdutils_common_opts.h

Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'

2012-08-20 17:06:50 +02:00

cmdutils.c

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

common.mak

checkheaders: Rename HEADEROBJS to HOBJS

2012-08-09 05:02:45 +02:00

configure

mips: add assembler flags for mips32r2 ISA and mhard-float

2012-08-17 18:54:41 +02:00

COPYING.GPLv2

Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.

2009-06-05 09:51:31 +00:00

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

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01:00

Doxyfile

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +02:00

ffmpeg_filter.c

Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'

2012-08-20 17:06:50 +02:00

ffmpeg_opt.c

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

ffmpeg.c

ffmpeg: reindent after last commit.

2012-08-19 11:23:59 +02:00

ffmpeg.h

Merge remote-tracking branch 'qatar/master'

2012-08-18 15:20:32 +02:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2012-08-09 00:51:02 +02:00

LICENSE

LICENSE: correct incorrect claims on *GPL incompatibility

2012-08-16 04:47:18 +02:00

MAINTAINERS

Canopus Lossless decoder

2012-08-01 22:02:19 -04:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-08-10 04:46:13 +02:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: update, seem this has been forgotten

2012-07-01 21:21:07 +02: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.

Languages

C 89.9%

Assembly 8.1%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%