FFmpeg git repo
Go to file
Michael Niedermayer 71fcb6072e Merge commit '3fb29588a27a711132106b924e27b53789a58dcb'
* commit '3fb29588a27a711132106b924e27b53789a58dcb':
  vf_drawtext: don't leak the expressions.
  vf_crop: make config_props work properly when called multiple times.
  vf_setdar: make config_props work properly when called multiple times.

Conflicts:
	libavfilter/vf_aspect.c
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 11:29:22 +02:00
compat
doc Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9' 2013-05-17 10:38:08 +02:00
libavcodec Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9' 2013-05-17 10:38:08 +02:00
libavdevice Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110' 2013-05-16 09:56:43 +02:00
libavfilter Merge commit '3fb29588a27a711132106b924e27b53789a58dcb' 2013-05-17 11:29:22 +02:00
libavformat Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9' 2013-05-17 10:38:08 +02:00
libavresample
libavutil Rename ffadler to ffhash and expand it using the generic hash API 2013-05-16 17:58:56 +02:00
libpostproc
libswresample
libswscale replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_* 2013-05-15 11:23:14 +02:00
presets
tests Turn off usage of base_data_offset in tfhd for PIFF files 2013-05-17 10:04:45 +02:00
tools tools/ffhash: Use O_BINARY when available 2013-05-17 00:38:07 +02:00
.gitignore Rename ffadler to ffhash and expand it using the generic hash API 2013-05-16 17:58:56 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9' 2013-05-17 10:38:08 +02:00
INSTALL
LICENSE lavfi: port wavelet denoiser filter from libmpcodecs. 2013-05-16 00:45:45 +02:00
MAINTAINERS lavfi: factorize drawgrid and drawbox code 2013-05-17 00:46:32 +02:00
Makefile
README
RELEASE
arch.mak
cmdutils.c Merge remote-tracking branch 'qatar/master' 2013-05-15 11:10:09 +02:00
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9' 2013-05-17 10:38:08 +02:00
ffmpeg.c ffmpeg: free threads on error conditions. 2013-05-15 01:28:59 +02:00
ffmpeg.h
ffmpeg_filter.c Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1' 2013-05-10 22:51:04 +02:00
ffmpeg_opt.c
ffplay.c
ffprobe.c
ffserver.c
library.mak
version.sh

README

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.