Go to file
Michael Niedermayer db0384c9c9 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dsicinav: Clip the source size to the expected maximum

Clipping the compressed size based on the uncompressed size is not correct
thus this commit is not merged, and the merge is for git metadata only

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 12:58:26 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-19 11:08:38 +02:00
doc doc/filters: document vf_scales color range 2013-07-20 23:24:13 +02:00
libavcodec Merge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93' 2013-07-21 11:59:16 +02:00
libavdevice avdevice/lavfi: fix input with unknown channel layout 2013-07-13 23:10:05 +02:00
libavfilter vfilter/vf_scale: avoid using "{}" 2013-07-21 04:47:09 +02:00
libavformat Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9' 2013-07-20 10:39:53 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
libavutil lavu/log: print prefix after \r. 2013-07-20 11:06:19 +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: remove unneeded include assert.h 2013-07-19 18:52:41 +02:00
presets
tests tests/tiny_psnr: remove unneeded include assert.h 2013-07-19 18:55:49 +02:00
tools Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d' 2013-07-07 11:35:59 +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
Changelog lavfi: port perspective filter from libmpcodecs 2013-07-14 16:27:17 +00:00
cmdutils_common_opts.h
cmdutils.c cmdutils: replace exit() by exit_program() 2013-07-08 11:12:32 +02:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
common.mak
configure Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4' 2013-07-19 10:26:07 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg_filter: replace exit() by exit_program() 2013-07-08 11:09:22 +02:00
ffmpeg_opt.c ffmpeg_opt: do not warn about unused gop_timecode 2013-07-09 10:54:40 +02:00
ffmpeg.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffmpeg.h
ffplay.c ffplay: use start_time as next audio pts on flush when seeking is not supported 2013-07-20 02:32:43 +02:00
ffprobe.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffserver.c Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4' 2013-07-19 10:26:07 +02:00
INSTALL
library.mak
LICENSE lavfi: port perspective filter from libmpcodecs 2013-07-14 16:27:17 +00:00
MAINTAINERS MAINTAINERS: drop 1.1 from the releases that i maintain 2013-07-15 02:30:36 +02:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
README
RELEASE Update for 2.0 2013-07-10 02:15:43 +02:00
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.