Merge commit 'fae753af709537fc75ff1c4ce21fc1f4429af929'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer 2013-11-01 18:31:12 +01:00

parent c6c03dfdf1 fae753af70

commit c97d397cbb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available