Changeset 0500623d in ffmpeg

Timestamp:

Jan 19, 2014, 4:48:07 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5800b085

Parents:

ad8d063f (diff), 2dc5980 (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> (01/19/14 16:48:02)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/19/14 16:48:07)

Message:

Merge remote-tracking branch 'cigaes/master'

• cigaes/master: lavfi/dualinput: fix shortest option. lavfi/vf_tile: use av_make_q. lavfi/avf_concat: use av_make_q. lavfi/af_amerge: use av_make_q. lavu/rational: add syntactic sugar.

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

(No files)