FFmpeg

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

Go to file

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

* qatar/master:
  libxvid: remove disabled code
  qdm2: make a table static const
  qdm2: simplify bitstream reader setup for some subpacket types
  qdm2: use get_bits_left()
  build: Consistently handle conditional compilation for all optimization OBJS.
  avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
  msrle: convert MS RLE decoding function to bytestream2.
  x86inc improvements for 64-bit

Conflicts:
	common.mak
	libavcodec/avpacket.c
	libavcodec/bfi.c
	libavcodec/msrledec.c
	libavcodec/qdm2.c

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

2012-04-13 00:39:19 +02:00

doc

lavfi/mp: remove 2xsai wrapped filter

2012-04-13 00:14:06 +02:00

ffpresets

Merge remote-tracking branch 'qatar/master'

2011-10-20 02:34:51 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-04-13 00:39:19 +02:00

libavdevice

Merge remote-tracking branch 'qatar/master'

2012-04-04 21:17:52 +02:00

libavfilter

lavfi/mp: remove 2xsai wrapped filter

2012-04-13 00:14:06 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-04-13 00:39:19 +02:00

libavutil

Merge remote-tracking branch 'qatar/master'

2012-04-13 00:39:19 +02:00

libpostproc

libpostproc: fix out of array accesses detected by AddressSanitizer.

2012-02-29 04:25:13 +01:00

libswresample

swr: add a swr_flags AVOption

2012-04-11 14:10:22 +02:00

libswscale

Merge remote-tracking branch 'qatar/master'

2012-04-13 00:39:19 +02:00

mt-work

Update todo

2011-06-12 18:01:29 +02:00

presets

Remove redundant libx264 preset files

2011-10-22 01:32:10 +02:00

tests

latmenc: copy pce config from proper location.

2012-04-12 20:28:37 +02:00

tools

Merge remote-tracking branch 'qatar/master'

2012-03-10 01:12:08 +01:00

.gitignore

Merge remote-tracking branch 'qatar/master'

2012-03-25 23:10:30 +02:00

arch.mak

build: Consistently handle conditional compilation for all optimization OBJS.

2012-04-12 09:00:49 +02:00

Changelog

lavfi: port 2xsai filter from libmpcodecs

2012-04-13 00:14:06 +02:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

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

cmdutils.c

cmdutils: parse options for swr

2012-04-11 14:10:21 +02:00

cmdutils.h

cmdutils: parse options for swr

2012-04-11 14:10:21 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-04-13 00:39:19 +02:00

configure

lavfi: port 2xsai filter from libmpcodecs

2012-04-13 00:14:06 +02:00

COPYING.GPLv2

…

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

remove avconv from Doxyfile

2012-01-25 22:47:45 +01:00

ffmpeg.c

ffmpeg: fix ticks_per_frame for the avi stream copy case

2012-04-12 12:57:22 +02:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2012-04-11 22:50:22 +02:00

ffprobe.c

ffprobe: use avbprint API

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

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-03-29 04:11:10 +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-03-26 20:52:52 +02:00

LICENSE

Remove libpostproc.

2012-02-23 19:36:16 +01:00

MAINTAINERS

ZeroCodec Decoder

2012-03-19 00:19:13 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-04-13 00:39:19 +02:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: bump to current version (0.10.2).

2012-03-26 22:47:28 +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 90.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%