1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-29 08:19:48 +02:00
Go to file
Michael Niedermayer fdb1f7eb7a Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'
* commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493':
  sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp

Conflicts:
	libavcodec/hpeldsp.h
	libavcodec/sparc/dsputil_vis.c
	libavcodec/sparc/hpeldsp_vis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 15:11:06 +02:00
compat Provide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/. 2013-03-21 04:23:24 +01:00
doc doc/general: animated GIF are now compressed. 2013-04-19 23:59:21 +02:00
libavcodec Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493' 2013-04-20 15:11:06 +02:00
libavdevice avdevice/lavfi: add error checking for av_opt_set_int_list() 2013-04-12 20:39:07 +02:00
libavfilter lavc: add AV_CODEC_PROP_TEXT_SUB. 2013-04-19 13:15:54 +02:00
libavformat lavf/gif: add final_delay option. 2013-04-20 00:11:04 +02:00
libavresample Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 2013-03-28 11:20:41 +01:00
libavutil lavu: add av_clipd_c 2013-04-18 14:38:21 +00:00
libpostproc lavfi/pp: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
libswresample swr/rematrix: use av_calloc() 2013-04-15 20:31:06 +02:00
libswscale Fix libswscale compilation with --disable-optimizations on x86-32. 2013-04-18 12:47:16 +02:00
presets
tests lavc/gif: add flag to enable transparency detection between frames. 2013-04-19 23:59:21 +02:00
tools Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' 2013-04-11 23:50:39 +02:00
.gitignore Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02:00
arch.mak
Changelog Changelog: notify GIF improvements. 2013-04-19 23:59:22 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
cmdutils.c cmdutils: make the "-help filter=" output less confusing 2013-04-18 13:03:00 +02:00
cmdutils.h Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6' 2013-04-12 15:56:20 +02:00
common.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
configure Merge commit '28bc406c84b04a5f1458b90ff52ddbec73e46202' 2013-04-20 13:21:18 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb' 2013-04-12 15:19:32 +02:00
ffmpeg_opt.c ffmpeg: make -aspect work with -vcodec copy. 2013-04-18 22:59:54 +02:00
ffmpeg.c ffmpeg: make -aspect work with -vcodec copy. 2013-04-18 22:59:54 +02:00
ffmpeg.h Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' 2013-04-11 23:50:39 +02:00
ffplay.c ffplay: use format title metadata to set window caption. 2013-04-17 11:08:49 +02:00
ffprobe.c
ffserver.c ffserver/ctime1: avoid using strcpy() 2013-03-25 23:31:34 +01:00
INSTALL
library.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
LICENSE LICENSE: add libutvideo in the GPL libraries list. 2013-03-29 02:08:20 +01:00
MAINTAINERS MAINTAINERS: add opencl maintainer 2013-04-11 13:42:07 +02:00
Makefile Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02:00
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.