FFmpeg git repo
Go to file
Michael Niedermayer 072278c777 Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'
* commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1':
  libxvid: add working lumimasking and variance AQ

Conflicts:
	libavcodec/libxvid.c
	libavcodec/version.h

See: ccb212b6c3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07 03:08:25 +02:00
compat
doc libxvid: add working lumimasking and variance AQ 2014-04-06 23:23:13 +02:00
libavcodec Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1' 2014-04-07 03:08:25 +02:00
libavdevice pulseaudio: move NULL check up before dereference. 2014-04-06 19:38:51 +02:00
libavfilter Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8' 2014-04-05 19:16:39 +02:00
libavformat Merge remote-tracking branch 'cehoyos/master' 2014-04-06 23:57:42 +02:00
libavresample Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8' 2014-04-05 19:16:39 +02:00
libavutil Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
libpostproc
libswresample
libswscale swscale: add full bgra64 support 2014-04-02 19:44:08 +02:00
presets
tests Merge remote-tracking branch 'qatar/master' 2014-04-06 23:43:02 +02:00
tools
.gitignore
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123' 2014-04-06 23:29:47 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak lavd: Add QTKit input device. 2014-03-30 20:45:07 +02:00
configure Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: frame droping due to fps should not be a warning 2014-04-04 21:15:31 +02:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINER: Add CC for dshow maintainer 2014-04-03 01:41:23 +02:00
Makefile Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +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.