ffmpeg

Go to file

Michael Niedermayer d0ab71ed11 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  asfdec: cosmetics, reformat ff_asf_parse_packet()
  g.723.1: add missing CODEC_CAP_DR1
  avconv: remove now unneeded calls to avcodec_get_frame_defaults().
  lavc: initialize output AVFrame before decoding.

Conflicts:
	libavformat/asfdec.c

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

2012-10-24 14:26:13 +02:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

doc

Merge commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881'

2012-10-24 14:18:17 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-10-24 14:26:13 +02:00

libavdevice

lavd/lavfi: add graph_file option

2012-10-23 22:08:55 +02:00

libavfilter

lavd/lavfi: add graph_file option

2012-10-23 22:08:55 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-10-24 14:26:13 +02:00

libavresample

Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'

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

libavutil

Merge commit 'd82f188504410fdfa446c5682c128c31bb5851a4'

2012-10-24 14:10:44 +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

Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'

2012-10-24 12:53:26 +02:00

presets

presets: specify the codecs.

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

tests

Merge remote-tracking branch 'qatar/master'

2012-10-23 15:12:20 +02:00

tools

qt-faststart: check fseeko() return codes

2012-10-22 22:42:51 +02:00

.gitignore

Merge commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881'

2012-10-24 14:18:17 +02:00

arch.mak

Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

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

Changelog

LVF demuxer

2012-10-22 23:22:39 +00:00

cmdutils_common_opts.h

cmdutils: add -layouts option.

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

cmdutils.c

Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'

2012-10-24 12:53:26 +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 '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +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

ffmpeg_filter.c

ffmpeg: fix negative array index

2012-10-22 13:58:19 +02:00

ffmpeg_opt.c

Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'

2012-10-23 13:05:52 +02:00

ffmpeg.c

Merge remote-tracking branch 'qatar/master'

2012-10-24 14:26:13 +02:00

ffmpeg.h

ffmpeg: Make video filter graph reinit user selectable

2012-10-17 00:06:12 +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: 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 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 commit '80521c1997a23e148edf89e11b939ab8646297ca'

2012-10-24 12:53:26 +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

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 92.1%

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%