1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 44d0e520f8 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  qdm2: check and reset dithering index per channel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 05:26:17 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-05 13:11:06 +02:00
doc examples/muxing: add support to audio resampling 2013-07-06 12:31:16 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-07-08 05:26:17 +02:00
libavdevice
libavfilter replace some deprecated defines 2013-07-06 05:43:24 +00:00
libavformat Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14' 2013-07-08 05:02:52 +02:00
libavresample
libavutil Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e' 2013-07-07 11:26:28 +02:00
libpostproc
libswresample
libswscale
presets
tests avformat_find_stream_info: fallback to timestamps in analyzeduration check in more cases 2013-07-08 02:37:24 +02:00
tools Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d' 2013-07-07 11:35:59 +02:00
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-07-05 13:11:06 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffmpeg.h
ffplay.c
ffprobe.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
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.