FFmpeg git repo
Go to file
Michael Niedermayer 799d749c77 Merge remote-tracking branch 'qatar/master'
* qatar/master: (24 commits)
  yop: set channel layout
  wtv: set channel layout for mpeg audio
  westwood_aud: set channel layout
  wc3movie: set channel layout
  tmv: set channel layout
  tiertexseq: set channel layout
  swfdec: set channel layout
  sol: set channel layout
  smacker: set channel layout
  siff: set channel layout
  sierravmd: set channel layout
  rtpdec_amr: set channel layout
  rsodec: set channel layout
  rmdec: set channel layout for RA version 3
  qcp: set channel layout
  psxstr: set channel layout
  omadec: set channel layout
  oggparsespeex: validate channel count and set channel layout
  nuv: set channel layout
  mxg: set channel layout
  ...

Conflicts:
	libavformat/swfdec.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 11:09:38 +01:00
compat
doc Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
libavcodec Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b' 2012-11-13 10:55:07 +01:00
libavdevice Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
libavfilter Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-11-13 11:09:38 +01:00
libavresample Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
libavutil Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
libpostproc
libswresample
libswscale Merge remote-tracking branch 'qatar/master' 2012-11-10 12:44:39 +01:00
presets
tests remove tests/asynth1.sw 2012-11-13 10:36:25 +01:00
tools
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
INSTALL
LICENSE lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b' 2012-11-13 10:55:07 +01:00
ffmpeg.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
ffmpeg.h
ffmpeg_filter.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
ffmpeg_opt.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
ffplay.c
ffprobe.c
ffserver.c
library.mak
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.