FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Go to file

Michael Niedermayer 7ae473e8a0 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  nuv: K&R formatting cosmetics
  build: generalise rules and variable settings for av* programs
  nuv: check RTjpeg header for validity
  Revert "nuv: check per-frame header for validity."
  imc: remove unused field IMCContext.one_div_log2
  imc: fix size of a memset()
  imc: remove empty if() block
  fate: simplify variable setting filter.mak
  lavf: Declare an AVRational struct without a struct literal

Conflicts:
	Makefile
	configure
	libavcodec/nuv.c

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

2012-08-06 22:22:37 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2012-07-12 23:57:00 +02:00

doc

libtwolame MP2 encoding support

2012-08-05 17:06:59 +00:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-08-06 22:22:37 +02:00

libavdevice

Replace various inlined inverse AVRational with av_inv_q().

2012-08-06 00:04:36 +02:00

libavfilter

Replace various inlined inverse AVRational with av_inv_q().

2012-08-06 00:04:36 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-08-06 22:22:37 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

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

libavutil

Merge remote-tracking branch 'qatar/master'

2012-08-05 22:17:02 +02:00

libpostproc

pp: check that the argument is not NULL as this is not supported

2012-07-07 19:14:21 +02:00

libswresample

swr: fix 10l typo mixing in and out config.

2012-08-01 21:18:03 +02:00

libswscale

Merge remote-tracking branch 'qatar/master'

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

mt-work

…

presets

presets: specify the codecs.

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

tests

Merge remote-tracking branch 'qatar/master'

2012-08-06 22:22:37 +02:00

tools

tools/bisect-create: Support "bisect run"

2012-07-24 01:24:23 +02:00

.gitignore

tools/bisect: rename temporary file and add it to git ignore

2012-07-07 13:15:01 +02:00

arch.mak

Optimization of AMR NB and WB decoders for MIPS

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

Changelog

libtwolame MP2 encoding support

2012-08-05 17:06:59 +00:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

2012-04-05 21:50:50 +02:00

cmdutils.c

cmdutils/alloc_buffer: fix typo

2012-07-20 16:42:29 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2012-07-04 00:32:31 +02:00

common.mak

buildsys: fix c++ compilation

2012-07-30 17:51:33 +02:00

configure

Merge remote-tracking branch 'qatar/master'

2012-08-06 22:22:37 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

Doxyfile

Merge remote-tracking branch 'qatar/master'

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

ffmpeg.c

Replace various inlined inverse AVRational with av_inv_q().

2012-08-06 00:04:36 +02:00

ffplay.c

ffplay: fix warning that i just mistakenly introduced

2012-07-20 03:47:11 +02:00

ffprobe.c

ffprobe: refactor frames decoding.

2012-08-06 17:37:59 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-06-20 20:47:46 +02:00

INSTALL

…

library.mak

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

LICENSE

LICENSE: Document all GPL files

2012-08-04 04:03:08 +02:00

MAINTAINERS

Canopus Lossless decoder

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

Makefile

Merge remote-tracking branch 'qatar/master'

2012-08-06 22:22:37 +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

…

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%