diff options
| author | Michael Niedermayer <[email protected]> | 2013-11-01 18:31:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-11-01 18:31:12 +0100 |
| commit | c97d397cbbf9f7fcbfeba1caaf8ecf7a1e35ab3d (patch) | |
| tree | 4306c6e2a64f4db61e50ff729f6c21c0b8f56b07 /libavformat | |
| parent | c6c03dfdf1692137111fe4aea0b72a1cff08f71e (diff) | |
| parent | fae753af709537fc75ff1c4ce21fc1f4429af929 (diff) | |
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 <[email protected]>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions