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
49,178 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%
fa36270c4c
Go to file
Michael Niedermayer fa36270c4c Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a' 
* commit '99ccd2ba10eac2b282c272ad9e75f082123c765a':
  mlp: store the channel layout for each substream.

Conflicts:
	libavcodec/mlp_parser.c
	libavcodec/mlpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 15:52:39 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc lavf/segment: provide link to HTML M3U8 draft, also fix mentioned version in docs 2013-01-22 20:25:45 +01:00
libavcodec Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a' 2013-01-23 15:52:39 +01:00
libavdevice Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f' 2013-01-18 13:36:39 +01:00
libavfilter lavfi/showwaves: fix check on showwaves->outpicref 2013-01-22 20:34:29 +01:00
libavformat rtmp: fix buffer overflows in ff_amf_tag_contents() 2013-01-23 05:29:59 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-01-18 13:54:38 +01:00
libavutil Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9' 2013-01-23 14:31:55 +01:00
libpostproc build: postproc cleanup. 2012-12-30 02:27:52 +01:00
libswresample swr: support first_pts 2013-01-21 00:52:14 +01:00
libswscale sws: check that dither array is not null before memset 2013-01-19 23:38:17 +01:00
presets
tests Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6' 2013-01-22 14:09:59 +01:00
tools tools: add plotframes script 2013-01-15 22:50:19 +01:00
.gitignore .gitignore: add /doc/examples/pc-uninstalled 2013-01-17 17:59:18 +00:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog afade filter 2013-01-21 15:20:42 +00:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
cmdutils.c cmdline: fix -- to escape files starting with - 2013-01-19 14:50:36 +01:00
cmdutils.h lavf: remove nonexistent symbols 2013-01-11 10:07:52 +00:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
configure libm: Add fallback definition for cbrt() using pow() 2013-01-22 16:02:31 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg: sub2video: set resample size. 2013-01-01 23:06:34 +01:00
ffmpeg_opt.c Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d' 2013-01-15 15:32:48 +01:00
ffmpeg.c Merge commit 'd9bf716945046333c24580d538f450b516f15710' 2013-01-21 14:10:32 +01:00
ffmpeg.h Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06' 2012-12-20 02:38:02 +01:00
ffplay.c ffplay: flush video filters on seek 2013-01-19 00:48:06 +01:00
ffprobe.c ffprobe: do not escape '"' between single quotes. 2013-01-01 13:32:51 +01:00
ffserver.c ffserver: add missing padding to extradata. 2012-12-30 22:22:18 +01:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
LICENSE lavfi: add histeq filter 2013-01-05 10:25:32 +01:00
MAINTAINERS MAINTAINERS: add 1.1, remove 0.10 2013-01-06 21:42:35 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
README
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01: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.