1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 482c1ac849 Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'
* commit '13f57a4d881ec669b87bf82f424bfff502433060':
  wav: K&R formatting cosmetics

Conflicts:
	libavformat/wavdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 11:06:27 +02:00
compat
doc
libavcodec Merge commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec' 2013-05-03 10:55:43 +02:00
libavdevice
libavfilter lavfi/blend: merge config_input_top into config_output 2013-05-02 12:22:18 +00:00
libavformat Merge commit '13f57a4d881ec669b87bf82f424bfff502433060' 2013-05-03 11:06:27 +02:00
libavresample
libavutil lavu/opencl: fix bug of opencl options 2013-05-02 14:42:02 +02:00
libpostproc
libswresample
libswscale
presets
tests fate: Adjust filter-trim-time parameters 2013-05-03 00:26:35 +02:00
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure lavu/opencl: fix the compile bug on linux 2013-05-03 04:15:29 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c ffmpeg: fix segfault with random output 2013-05-02 16:01:28 +02:00
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.