Go to file
Michael Niedermayer ab16d5b7b5 Merge commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886'
* commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886':
  ffv1: Assume bitdepth 0 means 8bit

Conflicts:
	libavcodec/ffv1dec.c

Note, FFmpeg is not affected by this bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 14:02:43 +02:00
compat
doc doc: make x11grab examples consistent with option names 2013-10-14 23:08:52 +02:00
libavcodec Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860' 2013-10-16 13:54:41 +02:00
libavdevice avdevice/pulse_audio_enc: fix stream index 2013-10-12 13:52:26 +02:00
libavfilter Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc' 2013-10-14 00:04:52 +02:00
libavformat avformat/mov: fix "correctly" typo 2013-10-16 00:26:10 +02:00
libavresample Merge commit '206895708ea2b464755d340e44501daf9a07c310' 2013-10-14 15:54:23 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2013-10-14 16:13:57 +02:00
libpostproc
libswresample
libswscale swscale: Use full resolution chroma for yuv2rgb when the input has full chroma 2013-10-10 17:28:59 +02:00
presets
tests Merge commit '6b081eff4dfc3c899960f69f30cb567266b7dca3' 2013-10-16 12:23:34 +02:00
tools
.gitignore
arch.mak
Changelog oggdec: add support for Opus in Ogg demuxing 2013-10-12 15:25:18 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure lavc: add a HEVC decoder. 2013-10-15 22:13:02 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c ffmpeg: set the source_index for trivial filter graphs 2013-10-11 00:51:09 +02:00
ffmpeg.h
ffplay.c ffplay: add support for changing the channel by the C key 2013-10-13 12:46:14 +02:00
ffprobe.c
ffserver.c ffserver: strip odd chars from html error messages before sending them back 2013-10-09 00:30:46 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add Communication section 2013-10-09 04:04:38 +02:00
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.