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
46,186 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%
a201639a01
Go to file
Michael Niedermayer a201639a01 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pixfmt: support more yuva formats
  swscale: support gray to 9bit and 10bit formats
  configure: rewrite print_config() function using awk
  FATE: fix (AD)PCM test dependencies broken in e519990
  Use ptrdiff_t instead of int for intra pred "stride" function parameter.
  x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.

Conflicts:
	libavcodec/h264pred.c
	libavcodec/h264pred_template.c
	libavutil/pixfmt.h
	libswscale/swscale_unscaled.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 17:47:36 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc lavfi: remove palette libmpcodecs wrapper 2012-10-30 16:21:33 +00:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-10-30 17:47:36 +01:00
libavdevice x11grab: fix mixed declaration and code 2012-10-29 22:24:10 +01:00
libavfilter lavfi: remove palette libmpcodecs wrapper 2012-10-30 16:21:33 +00:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-10-30 17:47:36 +01:00
libavresample Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8' 2012-10-30 14:40:22 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-10-30 17:47:36 +01:00
libpostproc pp: avoid overflow in w*h 2012-10-13 21:17:43 +02:00
libswresample swr: use 64bit index/len for x86_64 mix 2012-10-28 02:09:08 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-10-30 17:47:36 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge remote-tracking branch 'qatar/master' 2012-10-30 17:47:36 +01:00
tools qt-faststart: fix signedness of variable used to hold return code 2012-10-29 22:11:22 +01:00
.gitignore tools: add ffescape utility 2012-10-25 23:56:16 +02:00
arch.mak Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +02:00
Changelog caf muxer: write metadata 2012-10-26 03:12:45 +00:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.c Merge commit '381dc1a5ec0925b281c573457c413ae643567086' 2012-10-30 13:52:03 +01:00
cmdutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-10-26 15:20:48 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-10-30 17:47:36 +01: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
ffmpeg_filter.c ffmpeg: fix negative array index 2012-10-22 13:58:19 +02:00
ffmpeg_opt.c ffmpeg: use av_rescale_delta() on the audio filter input 2012-10-27 00:26:35 +02:00
ffmpeg.c Merge commit '381dc1a5ec0925b281c573457c413ae643567086' 2012-10-30 13:52:03 +01:00
ffmpeg.h ffmpeg: use av_rescale_delta() on the audio filter input 2012-10-27 00:26:35 +02:00
ffplay.c ffplay: if there is no audio stream, use external clock by default 2012-10-21 17:18:12 +02:00
ffprobe.c ffprobe: add an array of section print buffers to the WriterContext 2012-10-24 23:40:21 +02:00
ffserver.c Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26' 2012-10-28 13:19:11 +01:00
INSTALL
library.mak Merge commit '80521c1997a23e148edf89e11b939ab8646297ca' 2012-10-24 12:53:26 +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 remote-tracking branch 'qatar/master' 2012-10-26 15:20:48 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa' 2012-10-24 14:01:36 +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.