Changeset 16e25ef in ffmpeg

Timestamp:

May 30, 2012, 2:38:32 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e0a01e4c

Parents:

b0387ed (diff), c9cc7629 (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> (05/30/12 01:32:32)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/30/12 02:38:32)

Message:

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>

(No files)