virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity
31,625 Commits 37 Branches 403 Tags
5271b857eb
Go to file
Michael Niedermayer 5271b857eb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dnxhddec: avoid a branch in 10-bit decode_dct_block()
  H.264: Add optimizations to predict x86 assembly.
  riff: Add mpgv MPEG-2 fourcc
  add Flash Screen Video 2 decoder

Conflicts:
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-23 16:47:10 +02:00
doc
Merge remote-tracking branch 'qatar/master'
2011-07-23 16:47:10 +02:00
ffpresets
presets: forgotten libvpx presets
2011-06-21 17:52:16 +02:00
libavcodec
Merge remote-tracking branch 'qatar/master'
2011-07-23 16:47:10 +02:00
libavdevice
Merge remote-tracking branch 'qatar/master'
2011-07-15 17:51:09 +02:00
libavfilter
vf_mp: remove blackframe filter wrapper
2011-07-23 10:55:50 +02:00
libavformat
Merge remote-tracking branch 'qatar/master'
2011-07-23 16:47:10 +02:00
libavutil
Merge remote-tracking branch 'qatar/master'
2011-07-18 16:43:46 +02:00
libpostproc
Merge remote-tracking branch 'qatar/master'
2011-07-06 23:57:11 +02:00
libswscale
Merge remote-tracking branch 'qatar/master'
2011-07-21 16:28:53 +02:00
mt-work
Update todo
2011-06-12 18:01:29 +02:00
tests
Merge remote-tracking branch 'qatar/master'
2011-07-22 12:08:52 +02:00
tools
showfiltfmts: use av_get_pix_fmt_name()
2011-06-07 12:44:51 +02:00
.gitignore
Merge commit 'b5849f77095439e994b11c25e6063d443b36c228'
2011-07-14 02:24:10 +02:00
Changelog
Merge remote-tracking branch 'qatar/master'
2011-07-23 16:47:10 +02:00
cmdutils_common_opts.h
Make all option parsing functions match the function pointer type through which they are called.
2011-06-30 11:49:48 -04:00
cmdutils.c
cmdutils: remove #if 0-ed conflict marger trash that i forgot
2011-07-14 21:27:13 +02:00
cmdutils.h
Merge remote-tracking branch 'qatar/master'
2011-07-14 20:44:58 +02:00
common.mak
Merge remote-tracking branch 'qatar/master'
2011-07-21 16:28:53 +02:00
configure
Merge remote-tracking branch 'qatar/master'
2011-07-23 16:47:10 +02:00
COPYING.GPLv2
Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.
2009-06-05 09:51:31 +00:00
COPYING.GPLv3
Add configure option to upgrade (L)GPL to version 3.
2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1
Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.
2009-06-05 09:51:31 +00:00
COPYING.LGPLv3
Add configure option to upgrade (L)GPL to version 3.
2009-06-05 11:04:03 +00:00
CREDITS
Revert "partially rename FFmpeg to Libav"
2011-03-17 17:26:45 +01:00
Doxyfile
Merge remote-tracking branch 'qatar/master'
2011-07-14 20:44:58 +02:00
ffmpeg.c
Do not use AVFMT_FLAG_NONBLOCK for the output file.
2011-07-19 10:12:33 +02:00
ffplay.c
Merge remote-tracking branch 'qatar/master'
2011-07-17 20:12:02 +02:00
ffprobe.c
Merge remote-tracking branch 'qatar/master'
2011-07-22 12:08:52 +02:00
ffserver.c
Merge remote-tracking branch 'qatar/master'
2011-07-15 17:51:09 +02:00
ffserver.h
Add FFMPEG_ prefix to all multiple inclusion guards.
2007-10-17 09:37:46 +00:00
INSTALL
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
LICENSE
cosmetics: fix dashed line length after 070c5d0
2011-03-28 09:53:40 +02:00
MAINTAINERS
MAINTAINERS: add a "Releases" section
2011-06-24 11:15:26 +02:00
Makefile
Merge remote-tracking branch 'qatar/master'
2011-07-21 16:28:53 +02:00
README
cosmetics: fix dashed line length after 070c5d0
2011-03-28 09:53:40 +02:00
RELEASE
RELEASE: We are git after 0.8 release
2011-07-12 01:46:21 +02:00
subdir.mak
Merge remote-tracking branch 'qatar/master'
2011-07-12 01:42:32 +02:00
version.sh
version.sh: handle shallow clones and snapshots.
2011-07-22 10:43:59 +02:00

README 

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.
Description
Mirror of https://git.ffmpeg.org/ffmpeg.git
audiocffmpegffthevchlsmatroskamp4mpegmultimediartmprtspstreamingvideowebm
Readme 492 MiB
Languages
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%
Other 0.1%