No description
Find a file
Michael Niedermayer c1fc4ff937 Merge commit '02ec656af7'
* commit '02ec656af7':
  wmapro: error out on impossible scale factor offsets

The check is replaced by an assert(), as the condition cannot be
true except through bugs elsewhere (which should have been fixed
already)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30 13:35:36 +02:00
compat os2threads: move from lavc to compat/ 2013-05-28 12:49:20 +02:00
doc update all trac links to use the trac subdomain 2013-06-29 19:27:49 +02:00
libavcodec Merge commit '02ec656af7' 2013-06-30 13:35:36 +02:00
libavdevice avdevice/x11grab: allocate just one Cursor 2013-06-21 12:00:11 +02:00
libavfilter avfilter/avfilter: Make avfilter_register() thread safe 2013-06-28 12:44:03 +02:00
libavformat Added codec ID to playback DNxHD 2013-06-29 18:02:37 +02:00
libavresample Merge commit '006ec64877' 2013-05-18 11:25:58 +02:00
libavutil Merge commit 'b545179fdf' 2013-06-30 12:15:12 +02:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample cosmetics: Fix "dont" "wont" "doesnt" typos 2013-06-29 02:31:16 +02:00
libswscale swscale: Fix PAL8 input with alpha 2013-06-26 15:14:00 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate: Add Canopus Lossless YUY2 test 2013-06-25 11:26:23 +02:00
tools tools/qt-faststart: Fix unintended sign extension of current_offset 2013-06-02 23:10:44 +02:00
.gitignore Rename ffadler to ffhash and expand it using the generic hash API 2013-05-16 17:58:56 +02:00
arch.mak Merge commit 'b326755989' 2012-12-08 14:24:16 +01:00
Changelog lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
cmdutils.c cmdutils: dont change the log level for -report 2013-06-24 02:59:05 +02:00
cmdutils.h Merge commit 'e19e8aeeaa' 2013-04-12 15:56:20 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
common.mak Merge commit '472391b9a7' 2013-03-28 12:12:38 +01:00
configure Do not list libshine like a main option in configure's output. 2013-06-28 16:23:39 +02: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.c ffmpeg: Don't include colorspace.h 2013-06-29 16:44:12 -04:00
ffmpeg.h ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffmpeg_filter.c Merge commit '72fbc9685c' 2013-05-10 22:51:04 +02:00
ffmpeg_opt.c ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffplay.c ffplay: simplify and fix flushing out old subtitles on seeking 2013-06-26 22:30:16 +02:00
ffprobe.c ffprobe: always exit 1 in case of errors 2013-06-27 00:20:36 +02:00
ffserver.c ffserver: fix null pointer dereference 2013-06-04 13:19:27 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '472391b9a7' 2013-03-28 12:12:38 +01:00
LICENSE lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
MAINTAINERS Add maintainer for WebVTT demuxer and muxer 2013-06-18 18:02:30 +02:00
Makefile Merge commit '90f9a5830b' 2013-05-24 13:01:41 +02: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.