virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
45,184 Commits 37 Branches 400 Tags 465 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
52dc18d414
Go to file
Michael Niedermayer 52dc18d414 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86)
  x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86)
  x86: call most of the x86 dsp init functions under if (ARCH_X86)
  doc: support the new website layout
  doc: remove a warning from filters.texi
  doc: initial nut documentation
  segment: drop global headers setting
  lavu: fix typo in Makefile

Conflicts:
	doc/Makefile
	doc/filters.texi
	doc/t2h.init
	libavcodec/fmtconvert.c
	libavcodec/proresdsp.c
	libavcodec/x86/Makefile
	libavcodec/x86/vc1dsp_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08 21:46:34 +02:00
compat MinGW: Use our snprintf/vsnprintf when MinGW's is broken 2012-09-25 18:14:14 -04:00
doc Merge remote-tracking branch 'qatar/master' 2012-10-08 21:46:34 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-10-08 21:46:34 +02:00
libavdevice Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
libavfilter Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-10-08 21:46:34 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
libavutil Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
libpostproc postproc: Create version.h header 2012-09-28 15:06:26 +02:00
libswresample swr-test: avoid VLA 2012-10-06 13:48:47 +02:00
libswscale Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests TAK demuxer, decoder and parser 2012-10-08 09:06:25 +00:00
tools Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
.gitignore gitignore: codec_names.h is no more 2012-09-07 14:59:01 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog TAK demuxer, decoder and parser 2012-10-08 09:06:25 +00:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
cmdutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
configure TAK demuxer, decoder and parser 2012-10-08 09:06:25 +00: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 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01: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' 2012-08-04 23:51:43 +02:00
ffmpeg_filter.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ffmpeg_opt.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ffmpeg.c fix exit_program() prototypes 2012-10-02 21:55:31 +02:00
ffmpeg.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ffplay.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ffprobe.c ffprobe: reindent after previous commit 2012-10-05 23:58:23 +02:00
ffserver.c ffserver: fix potential buffer overflow, based on wrong fscanf format indentifier. 2012-10-02 22:59:03 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '581281e242609a222233a2e5538b89dfb88fb18e' 2012-09-20 03:20:29 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS MAINTAINERS: add 1.0 2012-09-27 01:48:14 +02:00
Makefile Makefile: remove old codec_names.h on distclean 2012-09-07 14:59:01 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update for 1.0 2012-09-27 01:48:14 +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 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.