Changeset 7f019129 in ffmpeg

Timestamp:

Oct 30, 2013, 4:48:47 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

44e8e82d

Parents:

94a80e36 (diff), 0c5f8396 (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> (10/30/13 16:48:43)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/30/13 16:48:47)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: lavf: Remove a now useless parameter to ffurl_register_protocol

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

(No files)