Changeset 47787831 in ffmpeg

Timestamp:

Apr 17, 2012, 2:03:50 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8a28fa01

Parents:

dcd207c4 (diff), 3b266da3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/17/12 02:01:17)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/17/12 02:03:50)

Message:

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>

(No files)