1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 0b6f34cc9f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avfilter: x86: consistent filenames for filter optimizations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 11:56:48 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc doc/filters: apply various rendering changes to the showspectrum docs 2013-02-05 00:12:55 +01:00
libavcodec ffv1: check for malloc failure 2013-02-05 00:37:20 +01:00
libavdevice lavd/alsa: simplify reordering functions definition. 2013-02-02 14:13:11 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2013-02-05 11:56:48 +01:00
libavformat lavf/segment: use correct spelling and value for EXT-X-ALLOW-CACHE tag 2013-02-03 11:17:35 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-01-18 13:54:38 +01:00
libavutil lavu/parseutils: add digital cinema frame sizes 2013-02-03 22:57:04 +01:00
libpostproc build: postproc cleanup. 2012-12-30 02:27:52 +01:00
libswresample swr: Dont use floats for S32->S32 when possible 2013-02-04 04:11:46 +01:00
libswscale sws: Fix "warning: comparison of distinct pointer types lacks a cast" 2013-02-04 14:34:13 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests sws: add planar RGB formats to isAnyRGB 2013-01-26 20:40:44 +01:00
tools Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
.gitignore .gitignore: add /doc/examples/pc-uninstalled 2013-01-17 17:59:18 +00:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog lavfi/showspectrum: display multiple channels in separate row 2013-02-04 13:37:43 +00:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
cmdutils.c cmdline: fix -- to escape files starting with - 2013-01-19 14:50:36 +01:00
cmdutils.h lavf: remove nonexistent symbols 2013-01-11 10:07:52 +00:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
configure build: Remove superfluous MAKE variable for the build suffix 2013-02-03 13:08:36 +01:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c ffmpeg: support filtering of unknown channel layouts. 2013-01-26 11:15:38 +01:00
ffmpeg_opt.c ffmpeg: free attachments, fix memleak 2013-02-03 03:09:23 +01:00
ffmpeg.c ffmpeg: implement -force_key_frames expression evalution 2013-01-27 16:56:47 +01:00
ffmpeg.h ffmpeg: implement -force_key_frames expression evalution 2013-01-27 16:56:47 +01:00
ffplay.c ffplay: remove misleading comment from audio_decode_frame() 2013-02-03 17:01:56 +01:00
ffprobe.c ffprobe: do not escape '"' between single quotes. 2013-01-01 13:32:51 +01:00
ffserver.c ffserver: add missing padding to extradata. 2012-12-30 22:22:18 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak build: Remove superfluous MAKE variable for the build suffix 2013-02-03 13:08:36 +01:00
LICENSE lavfi: add histeq filter 2013-01-05 10:25:32 +01:00
MAINTAINERS MAINTAINERS: add 1.1, remove 0.10 2013-01-06 21:42:35 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.