1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer a5a9bcc876 Merge commit 'f32aefcf349f2f1367f0143782397643416d18f3'
* commit 'f32aefcf349f2f1367f0143782397643416d18f3':
  faxcompr: K&R formatting cosmetics

Conflicts:
	libavcodec/faxcompr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-08 12:30:15 +02:00
compat
doc doc/filters: fix alias option name for chroma_mode in 'il' filter. 2013-06-07 16:34:00 +02:00
libavcodec Merge commit 'f32aefcf349f2f1367f0143782397643416d18f3' 2013-06-08 12:30:15 +02:00
libavdevice
libavfilter lavfi/lut3d: add sanity checks. 2013-06-07 01:48:41 +02:00
libavformat avformat/mov: compute dts_shift with trun cts 2013-06-07 16:30:27 +02:00
libavresample
libavutil avutil/mem: simplify av_reallocp_array() by using av_realloc_f() 2013-06-05 14:40:31 +02:00
libpostproc
libswresample swr: dont treat 32 and 24 as equal in simple copy check 2013-06-05 03:06:34 +02:00
libswscale Add unscaled converter from GBRP > 8bit to RGBx48/64. 2013-06-06 23:57:50 +02:00
presets
tests Add unscaled converter from GBRP > 8bit to RGBx48/64. 2013-06-06 23:57:50 +02:00
tools tools/qt-faststart: Fix unintended sign extension of current_offset 2013-06-02 23:10:44 +02:00
.gitignore
arch.mak
Changelog ffprobe: show chapter and chapter metadata information 2013-06-06 16:49:53 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: print threading capabilities for audio codecs 2013-06-07 14:24:52 +00:00
cmdutils.h
common.mak
configure lavfi: port sab filter from libmpcodecs 2013-06-05 00:06:51 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c' 2013-06-05 12:20:26 +02:00
ffmpeg.h
ffplay.c Use av_log() instead of fprintf() in ffplay. 2013-06-04 19:47:56 +02:00
ffprobe.c ffprobe: show chapter and chapter metadata information 2013-06-06 16:49:53 +02:00
ffserver.c ffserver: fix null pointer dereference 2013-06-04 13:19:27 +02:00
INSTALL
library.mak
LICENSE lavfi: port sab filter from libmpcodecs 2013-06-05 00:06:51 +02:00
MAINTAINERS MAINTAINERS: add fingerprint of the FFmpeg release signing key 2013-06-05 23:31:19 +02:00
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.