FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-29 21:47:48 +02:00

Go to file

Michael Niedermayer aa760b1735 Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'

* commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd':
  doc/platform: Add info on shared builds with MSVC
  doc/platform: Move a caveat down to the notes section
  ARM: reinstate optimised intmath.h
  ffv1: update to ffv1 version 3

Conflicts:
	doc/platform.texi
	libavcodec/ffv1.c
	libavcodec/ffv1.h
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-10-21 16:13:55 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2012-10-14 15:11:34 +02:00

doc

examples/decoding_encoding: prefer 'frame' over 'picture' for an AVFrame

2012-10-20 19:42:55 +02:00

libavcodec

Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'

2012-10-21 16:13:55 +02:00

libavdevice

caca: fix 10l typo

2012-10-12 19:05:58 +02:00

libavfilter

lavfi/silencedetect: increase duration precision.

2012-10-21 01:28:19 +02:00

libavformat

mp3demux: Rewrite xing TOC based seeking

2012-10-21 03:13:46 +02:00

libavresample

Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'

2012-10-14 14:46:13 +02:00

libavutil

Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'

2012-10-21 16:13:55 +02:00

libpostproc

pp: avoid overflow in w*h

2012-10-13 21:17:43 +02:00

libswresample

swresample: include ff_log2_tab for shared builds

2012-10-20 01:58:04 +02:00

libswscale

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

presets

presets: specify the codecs.

2012-05-04 18:40:36 +02:00

tests

Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'

2012-10-20 12:37:52 +02:00

tools

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

.gitignore

Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'

2012-10-20 12:37:52 +02:00

arch.mak

Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

2012-10-13 15:25:11 +02:00

Changelog

Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'

2012-10-19 13:47:47 +02:00

cmdutils_common_opts.h

cmdutils: add -layouts option.

2012-08-28 15:09:49 +02:00

cmdutils.c

cmdutils: add missing check for ftell() return

2012-10-18 00:10:59 +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 remote-tracking branch 'qatar/master'

2012-10-20 13:18:59 +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

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01:00

Doxyfile

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +02:00

ffmpeg_filter.c

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

ffmpeg_opt.c

Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'

2012-10-17 14:30:25 +02:00

ffmpeg.c

ffmpeg: Make video filter graph reinit user selectable

2012-10-17 00:06:12 +02:00

ffmpeg.h

ffmpeg: Make video filter graph reinit user selectable

2012-10-17 00:06:12 +02:00

ffplay.c

ffplay: Prevent 0/0 aspect from being passed on to lavfi

2012-10-14 23:40:14 +02:00

ffprobe.c

ffprobe: fix use of uninitialized pointer in av_strtok()

2012-10-11 03:37:43 +02:00

ffserver.c

ffm_read_write_index: check lseek return code

2012-10-17 20:35:16 +02:00

INSTALL

Merge remote branch 'qatar/master'

2011-04-08 02:50:13 +02:00

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 remote-tracking branch 'qatar/master'

2012-10-16 14:15:16 +02:00

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

RELEASE

prepare 9_beta1 release

2012-10-11 18:36:40 +02: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.

Languages

C 90.1%

Assembly 8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%

Other 0.1%