Merge commit 'fae753af709537fc75ff1c4ce21fc1f4429af929'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 17:31:12 +0000 (18:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 17:31:12 +0000 (18:31 +0100)
commitc97d397cbbf9f7fcbfeba1caaf8ecf7a1e35ab3d
tree4306c6e2a64f4db61e50ff729f6c21c0b8f56b07
parentc6c03dfdf1692137111fe4aea0b72a1cff08f71e
parentfae753af709537fc75ff1c4ce21fc1f4429af929
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>