1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 39354d6089 Merge commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec'
* commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec':
  jpegls: K&R formatting cosmetics

Conflicts:
	libavcodec/jpegls.c
	libavcodec/jpegls.h
	libavcodec/jpeglsdec.c
	libavcodec/jpeglsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 09:46:19 +02:00
compat
doc lavfi/mp: remove mp=ow wrapper. 2013-05-16 00:45:45 +02:00
libavcodec Merge commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec' 2013-05-16 09:46:19 +02:00
libavdevice replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_* 2013-05-15 11:23:14 +02:00
libavfilter lavfi/mp: remove mp=ow wrapper. 2013-05-16 00:45:45 +02:00
libavformat Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d' 2013-05-16 09:11:04 +02:00
libavresample Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd' 2013-05-05 11:50:37 +02:00
libavutil Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d' 2013-05-16 09:11:04 +02:00
libpostproc
libswresample swr/rematrix: use av_calloc() 2013-04-15 20:31:06 +02:00
libswscale replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_* 2013-05-15 11:23:14 +02:00
presets
tests vc1dec: Update destination pointers in context for fields 2013-05-15 11:38:49 +03:00
tools replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_* 2013-05-15 11:23:14 +02:00
.gitignore tools: add zmqsend tool, useful to test the zmq filters 2013-05-14 20:10:55 +02:00
arch.mak
Changelog lavfi: port wavelet denoiser filter from libmpcodecs. 2013-05-16 00:45:45 +02:00
cmdutils_common_opts.h
cmdutils.c Merge remote-tracking branch 'qatar/master' 2013-05-15 11:10:09 +02:00
cmdutils.h Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6' 2013-04-12 15:56:20 +02:00
common.mak
configure lavfi: port wavelet denoiser filter from libmpcodecs. 2013-05-16 00:45:45 +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: free threads on error conditions. 2013-05-15 01:28:59 +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: port wavelet denoiser filter from libmpcodecs. 2013-05-16 00:45:45 +02:00
MAINTAINERS avfilter: Add 'drawgrid' video filter 2013-05-13 21:34:15 +02:00
Makefile
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.