RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 09:12:33 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
43,764 Commits 37 Branches 400 Tags 244 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
bb3ed3bae6
Go to file
Michael Niedermayer bb3ed3bae6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: Add FATE tests for the Ut Video encoder
  lavc: add Ut Video encoder
  mpegvideo_enc: remove stray duplicate line from 7f9aaa4
  swscale: x86: fix #endif comments in rgb2rgb template file
  avconv: mark more options as expert.
  avconv: split printing "main options" into global and per-file.
  avconv: refactor help printing.

Conflicts:
	Changelog
	ffmpeg_opt.c
	ffserver.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-20 17:31:55 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-08-17 17:06:52 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
libavdevice dshow: protect access to curbufsize 2012-08-19 18:36:26 +02:00
libavfilter lavfi: add volumedetect filter. 2012-08-19 11:37:05 +02:00
libavformat lavc: move AVRn to a seperate decoder. 2012-08-20 02:46:09 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libavutil deprecate av_parse_cpu_flags 2012-08-16 22:04:46 +02:00
libpostproc Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
libswresample Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
libswscale libswscale: fix #endif comments in rgb2rgb_template.c 2012-08-16 18:40:11 +02:00
mt-work Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
presets
tests Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
tools Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
cmdutils_common_opts.h Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174' 2012-08-20 17:06:50 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
common.mak checkheaders: Rename HEADEROBJS to HOBJS 2012-08-09 05:02:45 +02:00
configure mips: add assembler flags for mips32r2 ISA and mhard-float 2012-08-17 18:54:41 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ffmpeg_filter.c Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174' 2012-08-20 17:06:50 +02:00
ffmpeg_opt.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
ffmpeg.c ffmpeg: reindent after last commit. 2012-08-19 11:23:59 +02:00
ffmpeg.h Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS Canopus Lossless decoder 2012-08-01 22:02:19 -04:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-08-10 04:46:13 +02:00
README
RELEASE RELEASE: update, seem this has been forgotten 2012-07-01 21:21:07 +02:00
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.