FFmpeg

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

Go to file

Michael Niedermayer 89ddff92a3 Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs"

This reverts commit 8e8c51318c.

Fixes Ticket873

Conflicts:

	tests/ref/acodec/pcm_s16be
	tests/ref/acodec/pcm_s24be
	tests/ref/acodec/pcm_s32be
	tests/ref/acodec/pcm_s8
	tests/ref/lavf/mov

Approved-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

2012-01-22 23:40:24 +01:00

doc

Merge remote-tracking branch 'qatar/master'

2012-01-21 23:11:27 +01:00

ffpresets

Merge remote-tracking branch 'qatar/master'

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

libavcodec

pthread: Change a signal to a broadcast as multiple threads

2012-01-22 23:07:09 +01:00

libavdevice

Revert "v4l2: poll the file descriptor"

2012-01-11 14:57:56 +01:00

libavfilter

avfilter: add some asserts() to check refcounts.

2012-01-22 19:30:40 +01:00

libavformat

Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs"

2012-01-22 23:40:24 +01:00

libavutil

base64: 10l endian fix.

2012-01-22 23:06:04 +01:00

libpostproc

pp: bump major in git master to match what debian contains.

2012-01-18 21:21:05 +01:00

libswresample

libswresample: introduce int swr_set_compensation() instead of void swr_compensate()

2012-01-09 04:16:06 +01:00

libswscale

sws: Fix unscaled >8bit planar chroma handling.

2012-01-22 15:30:06 +01: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

Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs"

2012-01-22 23:40:24 +01:00

tools

Merge remote-tracking branch 'qatar/master'

2012-01-21 23:11:27 +01:00

.gitignore

doc: fate: Support building a plain text version

2011-12-20 16:05:01 +01:00

avconv.c

Merge remote-tracking branch 'qatar/master'

2012-01-21 23:11:27 +01:00

Changelog

Merge remote-tracking branch 'qatar/master'

2012-01-17 02:37:30 +01:00

cmdutils_common_opts.h

ff*: add -max_alloc command line option

2011-12-25 18:55:43 +01:00

cmdutils.c

cmdutils: include type in filter list.

2012-01-19 23:33:17 +01:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2012-01-19 01:19:38 +01:00

common.mak

Add coverage support.

2011-12-05 20:04:48 +01:00

configure

build: Describe --nm and -ld options consistently

2012-01-22 23:40:24 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

Revert "partially rename FFmpeg to Libav"

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

Doxyfile

Fix a bunch of platform name and other typos.

2012-01-11 13:48:30 +01:00

ffmpeg.c

git show 2473a45c85 avconv.c | patch ffmpeg.c

2012-01-21 23:23:23 +01:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2012-01-21 23:11:27 +01:00

ffprobe.c

ffprobe: increase precision for the shown float values

2012-01-20 13:27:57 +01:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-01-21 23:11:27 +01:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2011-12-18 03:04:44 +01:00

LICENSE

libaac+ support

2011-09-26 02:28:21 +02:00

MAINTAINERS

MAINTAINERS: update release maintainers

2012-01-02 16:01:33 +01:00

Makefile

Makefile: fix path to ffprobe.xsd

2011-12-27 22:29:40 +01:00

README

Revert "partially rename FFmpeg to Libav"

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

RELEASE

Merge remote-tracking branch 'qatar/master'

2012-01-21 23:11:27 +01: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.

2) Licensing
------------

* See the LICENSE file.

Languages

C 90.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%