Changeset 3788b8db in ffmpeg

Timestamp:

Mar 23, 2014, 11:05:23 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0dd4eff

Parents:

5dfbecb3 (diff), c0c1fe7 (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> (03/23/14 23:04:56)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/23/14 23:05:23)

Message:

Merge remote-tracking branch 'cigaes/master'

• cigaes/master: lavu: add myself as dynarray.h maintainer. ffmpeg: sub2video: send a last blank frame before closing. tools: add dvd2concat. lavf/concatdec: allow to match streams by id.

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

(No files)