ffmpeg

Go to file

Michael Niedermayer 938adb7abc Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dwt: K&R prettyprinting cosmetics
  Remove libnut wrapper
  fate: change name of FATE samples location environment variable
  avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.
  http: Factorize the code by adding http_read_header()

Conflicts:
	configure
	doc/APIchanges
	doc/fate.texi
	libavcodec/dwt.c
	libavcodec/dwt.h
	libavformat/Makefile
	libavformat/avformat.h
	libavformat/libnut.c
	libavformat/matroskaenc.c
	libavformat/utils.c
	libavformat/version.h

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

2012-05-21 23:53:39 +02:00

doc

doc/ffprobe: document that ffprobe.xsd can be retrieved at a certain ffmpeg.org url

2012-05-21 10:32:08 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-05-21 23:53:39 +02:00

libavdevice

x11grab: use AV_OPT_TYPE_IMAGE_SIZE.

2012-05-20 18:24:20 +02:00

libavfilter

vsrc_mandelbrot: use AV_OPT_TYPE_IMAGE_SIZE.

2012-05-20 18:24:20 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-05-21 23:53:39 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

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

libavutil

opt: add AV_OPT_TYPE_IMAGE_SIZE.

2012-05-20 18:24:20 +02:00

libpostproc

libpostproc: fix out of array accesses detected by AddressSanitizer.

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

libswresample

swr: skip soft compensation when its disabled.

2012-05-19 22:42:32 +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

libavcodec: correct consumed bytes for decoders

2012-05-21 20:34:32 +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 commit '755cd4197d53946208e042f095b930dca18d9430'

2012-05-19 20:31:24 +02:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

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

cmdutils.c

cmdutils: allow to specify a stream by its ID.

2012-05-20 12:47:27 +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

Remove libnut wrapper

2012-05-21 08:51:50 +02:00

COPYING.GPLv2

…

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

ffmpeg: fix a crash with complex filters when pix_fmt is not specified

2012-05-20 19:36:00 +02:00

ffplay.c

ffplay: Use input picture parameters in input_request_frame().

2012-05-20 16:29:08 +02:00

ffprobe.c

ffprobe: remove ad-hoc behavior when nb_fmt_entries_to_show is 1

2012-05-21 10:32:25 +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

doc/examples: install them with the shared data.

2012-05-19 12:28:59 +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%