Changeset c97d397c in ffmpeg

Timestamp:

Nov 1, 2013, 5:31:12 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

66df6f5

Parents:

c6c03dfd (diff), fae753af (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.

Message:

Merge commit 'fae753af709537fc75ff1c4ce21fc1f4429af929'

• commit 'fae753af709537fc75ff1c4ce21fc1f4429af929': avplay: drop -vismv option which does not do anything anymore

Conflicts:

Changelog
ffplay.c

Not merged, the vismv option works fine in ffplay

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

(No files)