ffmpeg

x/ffmpeg

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

T

Michael Niedermayer 4778783160 Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'

* commit '3b266da3d35f3f7a61258b78384dfe920d875d29':
  avconv: add support for complex filtergraphs.
  avconv: make filtergraphs global.
  avconv: move filtered_frame from InputStream to OutputStream.
  avconv: don't set output width/height directly from input value.
  avconv: move resample_{width,height,pix_fmt} to InputStream.
  avconv: remove a useless variable from OutputStream.
  avconv: get output pixel format from lavfi.
  graphparser: fix the order in which unlabeled input links are returned.
  avconv: change {input,output}_{streams,files} into arrays of pointers.
  avconv: don't pass input/output streams to some functions.

Conflicts:
	cmdutils.c
	cmdutils.h
	doc/ffmpeg.texi
	ffmpeg.c
	ffplay.c

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

2012-04-17 04:03:50 +02:00

doc

Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'

2012-04-17 04:03:50 +02:00

ffpresets

Merge remote-tracking branch 'qatar/master'

2011-10-20 02:34:51 +02:00

libavcodec

svq3: check the watermark height.

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

libavdevice

Merge remote-tracking branch 'qatar/master'

2012-04-04 21:17:52 +02:00

libavfilter

Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'

2012-04-17 04:03:50 +02:00

libavformat

matroskadec: use av_grow_packet in merge_packets.

2012-04-16 22:17:24 +02:00

libavutil

mem.c: fix wrong comment.

2012-04-16 22:13:12 +02:00

libpostproc

libpostproc: fix out of array accesses detected by AddressSanitizer.

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

libswresample

swr: add a swr_flags AVOption

2012-04-11 14:10:22 +02:00

libswscale

sws: remove cliping in yuv2rgb code.

2012-04-15 23:38:42 +02:00

mt-work

Update todo

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

presets

Remove redundant libx264 preset files

2011-10-22 01:32:10 +02:00

tests

Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'

2012-04-17 04:03:50 +02:00

tools

Merge remote-tracking branch 'qatar/master'

2012-03-10 01:12:08 +01:00

.gitignore

Merge remote-tracking branch 'qatar/master'

2012-03-25 23:10:30 +02:00

arch.mak

build: Consistently handle conditional compilation for all optimization OBJS.

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

Changelog

lavfi: port 2xsai filter from libmpcodecs

2012-04-13 00:14:06 +02:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

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

cmdutils.c

avconv: get output pixel format from lavfi.

2012-04-15 20:22:36 +02:00

cmdutils.h

Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'

2012-04-17 04:03:50 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-04-13 00:39:19 +02:00

configure

configure: add dependencies for colormatrix test.

2012-04-15 14:21:14 +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 commit '3b266da3d35f3f7a61258b78384dfe920d875d29'

2012-04-17 04:03:50 +02:00

ffplay.c

Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'

2012-04-17 04:03:50 +02:00

ffprobe.c

ffprobe: use avbprint API

2012-04-08 00:02:21 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-03-29 04:11:10 +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

ZeroCodec Decoder

2012-03-19 00:19:13 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-04-13 00:39:19 +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.