ffmpeg

x/ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-01 18:17:53 +00:00

T

Michael Niedermayer 394b692b70 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avprobe: restore pseudo-INI old style format for compatibility.
  avprobe: fix formatting.
  log: make colored output more colorful.
  rtsp: Check for dynamic payload handlers if no static payload mapping was found

Conflicts:
	Changelog
	doc/ffprobe.texi
	ffprobe.c
	libavutil/log.c

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

2012-05-28 00:50:23 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2012-05-26 22:37:37 +02:00

libavcodec

x86: use new schema for ASM macros

2012-05-27 15:42:45 +02:00

libavdevice

avdevice: bump soname due to lavf soname bump

2012-05-25 12:22:21 +02:00

libavfilter

lswsutils: fix "ncompatible pointer type" warning

2012-05-26 20:46:00 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-05-28 00:50:23 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

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

libavutil

Merge remote-tracking branch 'qatar/master'

2012-05-28 00:50:23 +02:00

libpostproc

libpostproc: fix out of array accesses detected by AddressSanitizer.

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

libswresample

swr: fix swr_drop_output()

2012-05-26 02:33:38 +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

tests and tools: cleanup ffmpeg reference

2012-05-27 15:42:55 +02:00

tools

tests and tools: cleanup ffmpeg reference

2012-05-27 15:42:55 +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

Changelog: fix wrong/inaccurate entries.

2012-05-27 15:28: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

lavfi/deshake: add libavcodec dependency (dsputil).

2012-05-27 00:34:09 +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-26 22:37:37 +02:00

ffplay.c

ffplay: force exit when filter configuration fails

2012-05-24 23:48:52 +02:00

ffprobe.c

ffprobe: reduce the number of AVBPrint resets.

2012-05-26 22:53:13 +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

Merge remote-tracking branch 'qatar/master'

2012-02-22 02:24:18 +01:00

MAINTAINERS

MAINTAINERS: update versions

2012-05-24 21:15:01 +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.