1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer eda9d97b7a Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be'
* commit '46bb456853b197f4562de7acf5d42abf11ded9be':
  x86: dsputil: Refactor pixels16 wrapper functions with a macro

Conflicts:
	libavcodec/x86/hpeldsp_avg_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 10:18:46 +02:00
compat
doc doc/filters: add some examples for the fps filter 2013-05-14 00:33:52 +00:00
libavcodec Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be' 2013-05-14 10:18:46 +02:00
libavdevice Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7' 2013-05-04 10:17:52 +02:00
libavfilter avfilter: Add 'drawgrid' video filter 2013-05-13 21:34:15 +02:00
libavformat md5enc: don't reuse priv_class in two formats 2013-05-13 23:39:29 +02:00
libavresample Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd' 2013-05-05 11:50:37 +02:00
libavutil Add a generic hash API. 2013-05-13 21:42:37 +02: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 sws/output: remove offset/coef for alpha in rgba64 2013-05-12 22:01:18 +02:00
presets
tests Add 128 bit murmur3 hash function. 2013-05-13 21:42:37 +02:00
tools tools/ffeval: use av_dynarray2_add() 2013-05-13 13:52:37 +02:00
.gitignore Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02:00
arch.mak
Changelog ADPCM IMA Radical decoder 2013-05-10 16:53:50 -03:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
cmdutils.c lavfi: add timeline support. 2013-04-23 01:02:27 +02:00
cmdutils.h Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6' 2013-04-12 15:56:20 +02:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-05-13 11:36:46 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1' 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
ffmpeg.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
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
ffplay.c Merge commit '26a44143efb513a602542fb59aee87b1fc62af51' 2013-04-28 12:03:41 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE lavfi: add video stabilization plugins using vid.stab library 2013-04-24 18:30:42 +02:00
MAINTAINERS avfilter: Add 'drawgrid' video filter 2013-05-13 21:34:15 +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.