Changeset 50255b7a in ffmpeg

Timestamp:

Mar 20, 2015, 7:15:40 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

215c2fe0

Parents:

60b9373d (diff), 342fc46c (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/20/15 18:55:44)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/20/15 19:15:40)

Message:

Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'

• commit '342fc46c69199b076b7c210f42208ce39a2bde1c': cmdutils: Add a stream specifier to map usable streams

Conflicts:

cmdutils.c

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

(No files)