FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00

Go to file

Michael Niedermayer 1caf614bec Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: autoinsert resample filter when necessary.
  lavfi: add lavr-based audio resampling filter.
  x86: vc1: drop MMX loop filter implementation, which uses MMX2 instructions.

Conflicts:
	configure
	doc/filters.texi
	libavcodec/x86/vc1dsp_mmx.c
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/avfiltergraph.c

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

2012-05-13 00:13:49 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2012-05-13 00:13:49 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-05-13 00:13:49 +02:00

libavdevice

Merge remote-tracking branch 'qatar/master'

2012-05-07 22:51:34 +02:00

libavfilter

Merge remote-tracking branch 'qatar/master'

2012-05-13 00:13:49 +02:00

libavformat

lavf: extend the avi raw hack to mov

2012-05-11 16:53:22 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-05-10 23:30:42 +02:00

libavutil

Merge remote-tracking branch 'qatar/master'

2012-05-10 23:30:42 +02:00

libpostproc

libpostproc: fix out of array accesses detected by AddressSanitizer.

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

libswresample

swr: fix silence buffer for planar U8

2012-05-07 00:05:19 +02:00

libswscale

Add yuva422p pix_fmt.

2012-05-08 08:39:37 +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-05-11 20:57:39 +02:00

tools

Merge remote-tracking branch 'hexene/stagefright'

2012-04-19 01:58:30 +02:00

.gitignore

doc/examples: add programs to .gitignore.

2012-05-12 19:58:33 +02:00

arch.mak

build: Consistently handle conditional compilation for all optimization OBJS.

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

Changelog

Add Avid Meridien (AVUI) decoder.

2012-05-08 08:41:26 +02:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

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

cmdutils.c

Merge remote-tracking branch 'qatar/master'

2012-05-10 23:30:42 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-05-05 20:22:09 +02:00

configure

Merge remote-tracking branch 'qatar/master'

2012-05-13 00:13:49 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

Doxyfile

…

ffmpeg.c

ffmpeg: preserve bits_per_coded sample on stream copy.

2012-05-12 21:23:18 +02:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

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

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-05-06 21:53:19 +02:00

INSTALL

…

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

JACOsub demuxer, decoder and muxer.

2012-05-03 19:37:14 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-04-25 23:17:41 +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

…

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.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%

Other 0.1%