1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer 3fc8500483 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  smacker: add a clarification notice about audio decoding
  configure: make jack depend on pthreads

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 08:59:07 +02:00
compat Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
doc lavfi: add haldclut filter. 2013-05-27 20:42:28 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-05-28 08:59:07 +02:00
libavdevice v4l2: make possible to disable libv4l2 at runtime. 2013-05-22 19:49:29 +02:00
libavfilter lavfi/haldclutsrc: 10l remove size options. 2013-05-27 20:53:25 +02:00
libavformat Merge commit '564b7e0c0095768cd20001b28154d69462be54e7' 2013-05-28 08:04:02 +02:00
libavresample Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca' 2013-05-18 11:25:58 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2013-05-27 08:55:24 +02:00
libpostproc postproc/postprocess_template: remove empty comments 2013-05-23 14:39:58 +02:00
libswresample swr/rematrix: use av_calloc() 2013-04-15 20:31:06 +02:00
libswscale add YUVJ411P 2013-05-21 12:56:11 +02:00
presets
tests j2k/jpeg2000: merge j2k & jpeg2000 dwts, drop j2k dwt 2013-05-27 21:54:07 +02:00
tools tools/patcheck: fix misdetection with stuff like const_names 2013-05-23 19:11:28 +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: add haldclut filter. 2013-05-27 20:42:28 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
cmdutils.c cmdutils: print slice threading flag in -filters. 2013-05-24 15:34:37 +02:00
cmdutils.h Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6' 2013-04-12 15:56:20 +02:00
common.mak Integrate lcov/gcov into Libav 2013-04-05 18:55:11 +02:00
configure Merge remote-tracking branch 'qatar/master' 2013-05-28 08:59:07 +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 Merge commit '538bf767373f176b6487e30181155e74b37cced6' 2013-05-28 08:52:03 +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 ffplay: dont forget passing lowres to private options 2013-05-28 00:09:34 +02:00
ffprobe.c
ffserver.c ffserver: replace atoll() by strtoll() 2013-05-19 11:13:07 +02:00
INSTALL
library.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
LICENSE lavfi: port wavelet denoiser filter from libmpcodecs. 2013-05-16 00:45:45 +02:00
MAINTAINERS Support playing SMV files. 2013-05-22 15:20:22 +02:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +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.