1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 760c5278db Merge remote-tracking branch 'qatar/master'
* qatar/master:
  FATE: add a TAK test

Conflicts:
	tests/fate/lossless-audio.mak

No change as we already have a tak test with luckynight-partial.tak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-09 08:58:59 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-19 11:08:38 +02:00
doc Merge commit '3e5898782dce60334ab294821ca00b19c648cf66' 2013-08-08 12:11:33 +02:00
libavcodec Reduce MAKE_ACCESSORS code duplication via a new header. 2013-08-08 20:32:40 +02:00
libavdevice Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a' 2013-08-08 11:36:21 +02:00
libavfilter avfilter/vf_perspective: factor u cliping code 2013-08-09 00:03:43 +02:00
libavformat Merge commit 'dfc6b5c81491abf7effb97b23af17ccf7adcd132' 2013-08-09 07:16:38 +02:00
libavresample Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 2013-08-03 09:16:36 +02:00
libavutil Merge commit 'dfc6b5c81491abf7effb97b23af17ccf7adcd132' 2013-08-09 07:16:38 +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 swresample: fix negative rematrix volumns 2013-07-22 03:24:22 +02:00
libswscale swscale/utils: Fix potential overflow of srcPos*C before converting to 64bit 2013-08-08 02:56:26 +02:00
presets
tests ffmpeg: remove obsolete workaround in trim insertion. 2013-08-07 16:20:41 +02:00
tools Merge commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc' 2013-08-06 14:50:27 +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 Merge commit '3e5898782dce60334ab294821ca00b19c648cf66' 2013-08-08 12:11:33 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
cmdutils.c Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520' 2013-08-08 11:54:14 +02:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
common.mak Integrate lcov/gcov into Libav 2013-04-05 18:55:11 +02:00
configure Merge commit '3e5898782dce60334ab294821ca00b19c648cf66' 2013-08-08 12:11:33 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg: remove obsolete workaround in trim insertion. 2013-08-07 16:20:41 +02:00
ffmpeg_opt.c Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffmpeg.c Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffmpeg.h Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffplay.c ffplay: check for filter EOF return codes 2013-08-09 00:16:13 +02:00
ffprobe.c ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
ffserver.c Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7' 2013-08-06 09:13:51 +02:00
INSTALL
library.mak
LICENSE lavfi: port perspective filter from libmpcodecs 2013-07-14 16:27:17 +00:00
MAINTAINERS MAINTAINERS: add Alexander Strasser for the server 2013-08-09 00:03:43 +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.