virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
45,503 Commits 37 Branches 400 Tags 460 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
db51c65961
Go to file
Michael Niedermayer db51c65961 Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f' 
* commit '1bd442c276e6688b43777a198cad0d7e3a92123f':
  nut: prioritize native tags

Conflicts:
	tests/ref/lavfi/crop
	tests/ref/lavfi/crop_scale
	tests/ref/lavfi/crop_scale_vflip
	tests/ref/lavfi/crop_vflip
	tests/ref/lavfi/null
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_crop
	tests/ref/lavfi/pixfmts_hflip
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_pad
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip
	tests/ref/lavfi/scale200
	tests/ref/lavfi/scale500
	tests/ref/lavfi/vflip
	tests/ref/lavfi/vflip_crop
	tests/ref/lavfi/vflip_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-14 14:31:55 +02:00
compat MinGW: Use our snprintf/vsnprintf when MinGW's is broken 2012-09-25 18:14:14 -04:00
doc doc/nut: Clarify what/where is the official nut specification 2012-10-14 14:05:41 +02:00
libavcodec svq1dec: use log level that have more common sense 2012-10-14 09:21:48 +00:00
libavdevice caca: fix 10l typo 2012-10-12 19:05:58 +02:00
libavfilter lavfi/select/scene: use pointer increments instead of y*linesize. 2012-10-14 02:09:05 +02:00
libavformat Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f' 2012-10-14 14:31:55 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
libavutil avoid more "0xFF << 24" as it is considered a integer overflow in C99 2012-10-14 03:34:16 +02:00
libpostproc pp: avoid overflow in w*h 2012-10-13 21:17:43 +02:00
libswresample swr/rematrix: fix C99 left shift overflow 2012-10-14 03:48:05 +02:00
libswscale sws: get rid of C99 signed overflows try #2 2012-10-14 05:16:59 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests tests: fix checksums for png aspect ratio change 2012-10-13 18:47:18 +02:00
tools ffeval: avoid folding EOF onto a valid char 2012-10-13 20:35:56 +02:00
.gitignore gitignore: codec_names.h is no more 2012-09-07 14:59:01 +02:00
arch.mak Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +02:00
Changelog Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' 2012-10-10 13:51:07 +02:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.c Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +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 Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609' 2012-10-13 16:39:42 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ffmpeg_filter.c Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be' 2012-10-13 15:01:39 +02:00
ffmpeg_opt.c Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be' 2012-10-13 15:01:39 +02:00
ffmpeg.c Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be' 2012-10-13 15:01:39 +02:00
ffmpeg.h Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be' 2012-10-13 15:01:39 +02:00
ffplay.c ffplay: use audio parameters from the decoded frame instead of AVCodecContext 2012-10-13 16:47:50 +02:00
ffprobe.c ffprobe: fix use of uninitialized pointer in av_strtok() 2012-10-11 03:37:43 +02:00
ffserver.c ffserver: fix return value of add_codec() 2012-10-13 05:36:41 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-10-11 15:55:41 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS add dshow maintainer 2012-10-12 19:52:05 +02:00
Makefile Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +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

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.