ffmpeg

x/ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-04 04:35:31 +00:00

T

Michael Niedermayer 16e25ef34b Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: extend -r to work on any input stream.
  doc/avconv: expand documentation for the -s option.
  avconv: don't print filters inserted by avconv in stream mappings.
  avconv: merge configuration code for complex and simple filters
  avconv: split configuring input filters out of configure_complex_filter

Conflicts:
	configure
	doc/ffmpeg.texi
	ffmpeg.c
	tests/ref/fate/idroq-video-encode

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

2012-05-30 04:38:32 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2012-05-30 04:38:32 +02:00

libavcodec

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

libavdevice

avdevice: bump soname due to lavf soname bump

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

libavfilter

avfilter: include required header file avfilter.h in video.h

2012-05-29 15:36:06 +02:00

libavformat

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

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

libavutil

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

libpostproc

libpostproc: fix out of array accesses detected by AddressSanitizer.

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

libswresample

Merge remote-tracking branch 'qatar/master'

2012-05-30 04:38: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

Merge remote-tracking branch 'qatar/master'

2012-05-30 04:38:32 +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: apply misc formatting fixes

2012-05-29 13:06:38 +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

Merge remote-tracking branch 'qatar/master'

2012-05-30 04:38:32 +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-30 04:38:32 +02:00

ffplay.c

ffplay: force exit when filter configuration fails

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

ffprobe.c

ffprobe: fix C escaping.

2012-05-30 01:07:41 +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.