FFmpeg git repo
Go to file
Michael Niedermayer 946cbf04ee Merge remote-tracking branch 'qatar/master'
* qatar/master:
  af_join: do not leak input frames.
  asrc_anullsrc: return EOF, not -1

Conflicts:
	libavfilter/asrc_anullsrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 16:58:41 +01:00
compat
doc Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf' 2013-03-16 16:09:37 +01:00
libavcodec Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6' 2013-03-16 14:10:09 +01:00
libavdevice lavd/v4l2: silence libv4l2 logging 2013-03-16 02:44:36 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2013-03-16 16:58:41 +01:00
libavformat Merge commit 'aa3c77998404cc32233cb76e961ca27db8565459' 2013-03-16 15:38:13 +01:00
libavresample
libavutil Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b' 2013-03-16 16:38:11 +01:00
libpostproc
libswresample
libswscale
presets
tests fate: test both direct and indirect paths in delogo filter. 2013-03-16 16:22:56 +01:00
tools Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf' 2013-03-16 16:09:37 +01:00
.gitignore
arch.mak
Changelog lavfi: add perms and aperms filters. 2013-03-16 16:04:59 +01:00
cmdutils_common_opts.h
cmdutils.c opt: re-enable memleak fix for duplicated options. 2013-03-13 07:25:16 +01:00
cmdutils.h
common.mak
configure lavc: make compilation of frame_thread_encoder.o optional. 2013-03-14 15:04:17 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c Merge commit '3e175a2a550f5c2f788e8cd969052e10a5025a27' 2013-03-15 12:54:05 +01:00
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c opt: re-enable memleak fix for duplicated options. 2013-03-13 07:25:16 +01:00
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: mention that people are welcome to pick up and maintain older releases 2013-03-14 14:50:42 +01: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.