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
51,615 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%
29a4221ad3
Go to file
Michael Niedermayer 29a4221ad3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libopenjpeg: Add support for XYZ colorspace, found in DCINEMA frames

Conflicts:
	libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 12:52:23 +02:00
compat Provide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/. 2013-03-21 04:23:24 +01:00
doc doc/filters: clarify example explanation 2013-04-05 12:47:10 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-04-05 12:52:23 +02:00
libavdevice lavd/v4l2: fully init an ioctl argument. 2013-04-01 10:38:14 +02:00
libavfilter lavfi/blend: use standard options parsing 2013-04-05 00:14:55 +00:00
libavformat Merge commit '8c65264595d5a82c56ae5043320e4b875a414229' 2013-04-05 12:39:06 +02:00
libavresample Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 2013-03-28 11:20:41 +01:00
libavutil Merge commit '8c65264595d5a82c56ae5043320e4b875a414229' 2013-04-05 12:39:06 +02:00
libpostproc libpostproc: silence valgrind/fate warning about using uninitialized data 2013-03-25 21:48:45 +01:00
libswresample buildsys: only include log2_tab per library for shared builds 2013-03-04 12:25:02 +01:00
libswscale Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 2013-03-28 11:20:41 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests lavc: do not init frame with guessed layout. 2013-04-03 17:44:10 +02:00
tools tools: add audio normalize script example. 2013-03-26 01:50:13 +01:00
.gitignore doc: enable compilation of -all tool pages 2013-04-05 10:11:57 +02:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog aphaser filter 2013-04-03 08:33:59 +00:00
cmdutils_common_opts.h cmdutils_common_opts: fix loglevel help text as its inaccurate 2013-03-31 18:06:18 +02:00
cmdutils.c cmdutils: remove error message from opt_default() in case of missing option 2013-04-05 10:48:32 +02:00
cmdutils.h cmdutils: avtool -> fftool 2013-03-31 18:22:23 +02:00
common.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
configure doc: enable compilation of -all tool pages 2013-04-05 10:11:57 +02: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 CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c ffmpeg/avformat: factor av_guess_frame_rate() out 2013-03-29 17:40:28 +01:00
ffmpeg_opt.c Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c' 2013-03-28 13:00:39 +01:00
ffmpeg.c Add a work-around for msvc compilation until c99-to-c89 issue 7 is fixed. 2013-04-04 00:01:34 +02:00
ffmpeg.h Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c' 2013-03-28 13:00:39 +01:00
ffplay.c ffplay: use seek per time for ogg by default 2013-04-02 01:36:45 +02:00
ffprobe.c ffprobe: set writer context to 0 after allocation 2013-03-19 18:00:34 +01:00
ffserver.c ffserver/ctime1: avoid using strcpy() 2013-03-25 23:31:34 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
LICENSE LICENSE: add libutvideo in the GPL libraries list. 2013-03-29 02:08:20 +01:00
MAINTAINERS Update MAINTAINERS with information about avisynth demuxer. 2013-03-27 03:47:56 +01:00
Makefile Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3' 2013-03-28 12:07:38 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01: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.