RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
53,086 Commits 37 Branches 400 Tags 254 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
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 Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7' 2013-05-04 10:17:52 +02:00
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 Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd' 2013-05-05 11:50:37 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2013-05-15 11:10:09 +02:00
libpostproc
…
libswresample swr/rematrix: use av_calloc() 2013-04-15 20:31:06 +02:00
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
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
Changelog lavfi: add dctdnoiz filter. 2013-05-15 00:54:00 +02:00
INSTALL
…
LICENSE lavfi: add video stabilization plugins using vid.stab library 2013-04-24 18:30:42 +02:00
MAINTAINERS avfilter: Add 'drawgrid' video filter 2013-05-13 21:34:15 +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 Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6' 2013-04-12 15:56:20 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
common.mak
…
configure lavfi: add dctdnoiz filter. 2013-05-15 00:54:00 +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
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
ffplay.c Merge commit '26a44143efb513a602542fb59aee87b1fc62af51' 2013-04-28 12:03:41 +02:00
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.