1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer 4daf8bc31b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vc1dsp: K&R formatting cosmetics

Conflicts:
	libavcodec/vc1dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-12 20:04:35 +01:00
compat
doc examples/muxing: simplify video PTS setting 2014-01-12 09:25:48 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2014-01-12 20:04:35 +01:00
libavdevice
libavfilter Merge commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24' 2014-01-10 03:46:28 +01:00
libavformat mpegts muxer, DVB subtitles encoder: common DVB subtitles payload 2014-01-12 16:40:52 +01:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2014-01-11 03:08:10 +01:00
libpostproc
libswresample
libswscale swscale: disable ARM code until its build failure with clang/iphone is fixed 2014-01-12 19:58:38 +01:00
presets
tests nut: Support XYZ12 rawvideo 2014-01-10 17:51:13 +01:00
tools
.gitignore
arch.mak
Changelog nut: Support XYZ12 rawvideo 2014-01-10 17:51:13 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2014-01-11 03:08:10 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c
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.