1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer 000f8bcd03 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents

Conflicts:
	libavcodec/g2meet.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30 12:03:12 +02:00
compat
doc Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8' 2013-07-30 11:26:39 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-07-30 12:03:12 +02:00
libavdevice avdevice/fbdev: use AV_OPT_TYPE_VIDEO_RATE 2013-07-26 15:21:25 +00:00
libavfilter Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8' 2013-07-30 11:26:39 +02:00
libavformat Merge commit '1f57d60129b0e297cd197c6031c4439b30a6b503' 2013-07-30 11:57:43 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-07-26 11:12:11 +02:00
libavutil Merge commit 'd99a2b6d0a4d0b2f5ba6a1f1637d6cb88c5c9184' 2013-07-30 11:06:03 +02:00
libpostproc
libswresample
libswscale swscale/fill_rgb2yuv_table: fix default detection 2013-07-27 01:11:37 +02:00
presets
tests Merge commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7' 2013-07-30 11:13:34 +02:00
tools
.gitignore
arch.mak
Changelog lavfi: add compand filter 2013-07-29 19:11:50 +00:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '4822ee3ca620a92cd2b0a9a03ea9e34288192c79' 2013-07-30 11:20:12 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c Merge remote-tracking branch 'qatar/master' 2013-07-26 11:12:11 +02:00
ffprobe.c ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
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.