FFmpeg git repo
Go to file
Michael Niedermayer ff4680922f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*

Conflicts:
	doc/APIchanges
	libavcodec/avpicture.c
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c
	libavcodec/imgconvert.c
	libavcodec/tiffenc.c
	libavfilter/vf_pixdesctest.c
	libavfilter/vf_scale.c
	libavutil/imgutils.c
	libavutil/pixdesc.c
	libavutil/version.h
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 11:10:09 +02:00
compat
doc Merge remote-tracking branch 'qatar/master' 2013-05-15 11:10:09 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-05-15 11:10:09 +02:00
libavdevice
libavfilter Merge remote-tracking branch 'qatar/master' 2013-05-15 11:10:09 +02:00
libavformat Merge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01' 2013-05-15 10:15:15 +02:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2013-05-15 11:10:09 +02:00
libpostproc
libswresample
libswscale Merge remote-tracking branch 'qatar/master' 2013-05-15 11:10:09 +02:00
presets
tests fate: update the mmf reference 2013-05-14 18:50:27 +02:00
tools tools: add zmqsend tool, useful to test the zmq filters 2013-05-14 20:10:55 +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: add dctdnoiz filter. 2013-05-15 00:54:00 +02:00
cmdutils_common_opts.h
cmdutils.c Merge remote-tracking branch 'qatar/master' 2013-05-15 11:10:09 +02:00
cmdutils.h
common.mak
configure lavfi: add dctdnoiz filter. 2013-05-15 00:54:00 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c ffmpeg: free threads on error conditions. 2013-05-15 01:28:59 +02:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
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.