FFmpeg git repo
Go to file
Michael Niedermayer 325ee4ed7a Merge commit 'f337c29017b10c98ccb4dce20efced4c74b665f6'
* commit 'f337c29017b10c98ccb4dce20efced4c74b665f6':
  eatgq: return meaningful error codes.
  eatgv: cosmetics, reformat

Conflicts:
	libavcodec/eatgq.c
	libavcodec/eatgv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-26 14:47:08 +01:00
compat
doc Merge commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d' 2013-01-26 14:18:48 +01:00
libavcodec Merge commit 'f337c29017b10c98ccb4dce20efced4c74b665f6' 2013-01-26 14:47:08 +01:00
libavdevice
libavfilter lavfi/vf_drawtext: default to expansion=normal. 2013-01-26 12:52:19 +01:00
libavformat lavf/gifdec: cosmetics: remove extra whitespace 2013-01-26 09:28:57 +00:00
libavresample
libavutil Merge commit '38c1466ca41c73c7ce347da702362cb69c151716' 2013-01-26 13:34:30 +01:00
libpostproc
libswresample
libswscale sws: GBRP9, GBRP10 GBRP12 GBRP14 output support 2013-01-26 06:11:52 +01:00
presets
tests Merge commit '69c25c9284645cf5189af2ede42d6f53828f3b45' 2013-01-26 14:33:06 +01:00
tools
.gitignore
arch.mak
Changelog lavfi: version bump and change log entries after the last commits. 2013-01-26 11:25:21 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '2c10e2a2f62477efaef5b641974594f7df4ca339' 2013-01-25 14:14:21 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg: support filtering of unknown channel layouts. 2013-01-26 11:15:38 +01:00
ffmpeg_opt.c ffmpeg: add -guess_layout_max option. 2013-01-26 11:15:38 +01:00
ffmpeg.c ffmpeg: support filtering of unknown channel layouts. 2013-01-26 11:15:38 +01:00
ffmpeg.h ffmpeg: add -guess_layout_max option. 2013-01-26 11:15:38 +01:00
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.