1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer 826188d27a Merge commit 'ed1b01131e662c9086b27aaaea69684d8575fbea'
* commit 'ed1b01131e662c9086b27aaaea69684d8575fbea':
  mlp: implement support for AVCodecContext.request_channel_layout.

Conflicts:
	libavcodec/mlpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 16:44:30 +01:00
compat
doc lavf/segment: provide link to HTML M3U8 draft, also fix mentioned version in docs 2013-01-22 20:25:45 +01:00
libavcodec Merge commit 'ed1b01131e662c9086b27aaaea69684d8575fbea' 2013-01-23 16:44:30 +01:00
libavdevice Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f' 2013-01-18 13:36:39 +01:00
libavfilter lavfi/showwaves: fix check on showwaves->outpicref 2013-01-22 20:34:29 +01:00
libavformat rtmp: fix buffer overflows in ff_amf_tag_contents() 2013-01-23 05:29:59 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-01-18 13:54:38 +01:00
libavutil Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9' 2013-01-23 14:31:55 +01:00
libpostproc
libswresample swr: support first_pts 2013-01-21 00:52:14 +01:00
libswscale sws: check that dither array is not null before memset 2013-01-19 23:38:17 +01:00
presets
tests Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6' 2013-01-22 14:09:59 +01:00
tools
.gitignore .gitignore: add /doc/examples/pc-uninstalled 2013-01-17 17:59:18 +00:00
arch.mak
Changelog afade filter 2013-01-21 15:20:42 +00:00
cmdutils_common_opts.h
cmdutils.c cmdline: fix -- to escape files starting with - 2013-01-19 14:50:36 +01:00
cmdutils.h
common.mak
configure libm: Add fallback definition for cbrt() using pow() 2013-01-22 16:02:31 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c Merge commit 'd9bf716945046333c24580d538f450b516f15710' 2013-01-21 14:10:32 +01:00
ffmpeg.h
ffplay.c ffplay: flush video filters on seek 2013-01-19 00:48:06 +01:00
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.