virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
58,331 Commits 37 Branches 400 Tags 458 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
6a7980e2cd
Go to file
Michael Niedermayer 6a7980e2cd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dct/fft: Give consistent names to fixed/float template files

Conflicts:
	libavcodec/fft_fixed.c
	libavcodec/fft_float.c
	libavcodec/mdct_fixed.c
	libavcodec/mdct_float.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-21 19:26:01 +01:00
compat Merge remote-tracking branch 'qatar/master' 2013-11-07 23:39:31 +01:00
doc Merge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1' 2013-11-21 19:09:12 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-11-21 19:26:01 +01:00
libavdevice lavd/xv: free resources on errors 2013-11-15 09:56:58 +01:00
libavfilter avfilter/showspectrum: use 0 dummies for range in const. 2013-11-20 16:38:09 +01:00
libavformat avformat/utils: inject audio skip side data before the side data merge code 2013-11-21 03:21:23 +01:00
libavresample Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5' 2013-10-28 09:59:53 +01:00
libavutil avutil: reintroduce lls1 as the 52 ABI needs it 2013-11-17 16:44:32 +01:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample lswr: fix assert failure on unknown layouts. 2013-11-03 10:30:37 +01:00
libswscale swscale/x86: SIMD deinterleaveBytes() depends on YASM 2013-11-19 22:36:27 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit '874838dc6589d978611c89a40694a5074f892a76' 2013-11-21 18:49:41 +01:00
tools tools/probetest: also print the time the probe functions needed 2013-11-08 22:33:52 +01:00
.gitignore doc/examples: rename demuxing to demuxing_decoding. 2013-11-04 12:53:06 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
cmdutils_common_opts.h cmdutils: Add -buildconf option. 2013-11-19 22:09:48 +01:00
cmdutils.c cmdutils&ffmpeg: use av_fopen_utf8() for passlogfile 2013-11-21 18:27:46 +01:00
cmdutils.h cmdutils: Add -buildconf option. 2013-11-19 22:09:48 +01:00
common.mak Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23' 2013-11-15 12:19:45 +01:00
configure Merge remote-tracking branch 'qatar/master' 2013-11-21 12:10:15 +01:00
COPYING.GPLv2
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 CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c ffmpeg_filter: Fix non jpeg yuv in jpeg support 2013-10-27 17:41:06 +01:00
ffmpeg_opt.c ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. 2013-11-16 14:27:29 +01:00
ffmpeg.c cmdutils&ffmpeg: use av_fopen_utf8() for passlogfile 2013-11-21 18:27:46 +01:00
ffmpeg.h ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. 2013-11-16 14:27:29 +01:00
ffplay.c Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 2013-11-16 23:54:10 +01:00
ffprobe.c ffprobe: fix consistency checks in parse_read_intervals() 2013-10-21 13:33:06 +02:00
ffserver.c ffserver: strip odd chars from html error messages before sending them back 2013-10-09 00:30:46 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak build: remove pointless condition 2013-10-29 14:00:29 +00:00
LICENSE libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
MAINTAINERS MAINTAINERS: Add 1.2 back to the maintained releases 2013-11-12 14:33:54 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2013-11-04 01:20:46 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Update for 2.0 2013-07-10 02:15:43 +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.