FFmpeg git repo
Go to file
Michael Niedermayer b955d4072e Revert "Fix multi-channel AAC encoding."
This reverts commit b3452771c4.

A better solution was implemented by Nathan Caldwell.

Conflicts:

	libavcodec/aacenc.c
2012-01-24 02:31:56 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
ffpresets
libavcodec Revert "Fix multi-channel AAC encoding." 2012-01-24 02:31:56 +01:00
libavdevice
libavfilter avfilter: add some asserts() to check refcounts. 2012-01-22 19:30:40 +01:00
libavformat movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +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
libswscale sws: Fix unscaled >8bit planar chroma handling. 2012-01-22 15:30:06 +01:00
mt-work
presets
tests movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
tools Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Improve support for PGS subtitles. 2012-01-23 19:47:49 +01:00
Doxyfile
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
avconv.c Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +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
cmdutils_common_opts.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-01-23 01:05:20 +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-23 01:05:20 +01:00
library.mak
version.sh

README

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.