1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer d5518545d1 Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0'
* commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0':
  h263: remove an unused parameter from ff_h263_decode_init_vlc
  flac: add channel layout masks for streams with 7 or 8 channels.
  flac: don't check the number of channels before setting the channel layout.

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 13:42:56 +01:00
compat
doc doc: replace '×' symbol with 'x' 2013-02-06 22:55:36 +01:00
libavcodec Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0' 2013-02-07 13:42:56 +01:00
libavdevice
libavfilter lavfi: fix missing space in error message. 2013-02-07 12:22:09 +01:00
libavformat mov: remove unused function 2013-02-07 11:54:46 +01:00
libavresample
libavutil
libpostproc
libswresample
libswscale
presets
tests Merge commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa' 2013-02-06 16:40:59 +01:00
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d' 2013-02-06 15:57:45 +01:00
cmdutils.h
common.mak
configure Merge commit '79dad2a932534d1155079f937649e099f9e5cc27' 2013-02-07 13:09:35 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

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.