ffmpeg

Go to file

Michael Niedermayer 31dfe20dd2 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Replace some @file tags by more suitable markup.
  fate: Set FUZZ factor of vorbis-13 test to 2.
  fate: Set FUZZ factor of (e)ac3-encode test to 3.
  fate: remove unused code from regressions-funcs.sh
  rtmp: Don't assume path points to a string of nonzero length
  avconv: fix behavior with -ss as an output option.

Conflicts:
	doc/platform.texi
	doc/protocols.texi
	ffmpeg.c

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

2012-05-19 00:52:25 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2012-05-19 00:52:25 +02:00

libavcodec

build: add codec_names.h to SKIPHEADERS to fix make checkheaders.

2012-05-18 23:34:11 +02:00

libavdevice

lavd/dshow: fix make checkheaders.

2012-05-18 23:34:11 +02:00

libavfilter

pan: use ff_parse_channel_layout() instead of av_get_channel_layout().

2012-05-18 23:34:11 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-05-19 00:52:25 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-05-10 23:30:42 +02:00

libavutil

lavu/error: fix make checkheaders.

2012-05-18 23:34:11 +02:00

libpostproc

libpostproc: fix out of array accesses detected by AddressSanitizer.

2012-02-29 04:25:13 +01:00

libswresample

swr: add swr_get_delay() to find the exact delay the swresampler introduces.

2012-05-18 23:02:10 +02:00

libswscale

Add yuva422p pix_fmt.

2012-05-08 08:39:37 +02:00

mt-work

Update todo

2011-06-12 18:01:29 +02:00

presets

presets: specify the codecs.

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

tests

Merge remote-tracking branch 'qatar/master'

2012-05-19 00:52:25 +02:00

tools

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

.gitignore

doc/examples: add programs to .gitignore.

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

arch.mak

build: Consistently handle conditional compilation for all optimization OBJS.

2012-04-12 09:00:49 +02:00

Changelog

Merge remote-tracking branch 'qatar/master'

2012-05-16 02:27:31 +02:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

2012-04-05 21:50:50 +02:00

cmdutils.c

Merge remote-tracking branch 'qatar/master'

2012-05-10 23:30:42 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-05-05 20:22:09 +02:00

configure

configure: check for pthread_cancel.

2012-05-14 19:32:43 +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

remove avconv from Doxyfile

2012-01-25 22:47:45 +01:00

ffmpeg.c

Merge remote-tracking branch 'qatar/master'

2012-05-19 00:52:25 +02:00

ffplay.c

ffplay: put aspect ratio info to the VideoPicture struct

2012-05-15 00:31:56 +02:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

2012-05-17 23:45:00 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-05-06 21:53:19 +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-03-26 20:52:52 +02:00

LICENSE

Remove libpostproc.

2012-02-23 19:36:16 +01:00

MAINTAINERS

JACOsub demuxer, decoder and muxer.

2012-05-03 19:37:14 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-05-16 22:32:05 +02:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: bump to current version (0.10.2).

2012-03-26 22:47:28 +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%