[FFmpeg-cvslog] Merge commit 'fae753af709537fc75ff1c4ce21fc1f4429af929'

Michael Niedermayer git at videolan.org
Fri Nov 1 18:32:50 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  1 18:31:12 2013 +0100| [c97d397cbbf9f7fcbfeba1caaf8ecf7a1e35ab3d] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c97d397cbbf9f7fcbfeba1caaf8ecf7a1e35ab3d
---





More information about the ffmpeg-cvslog mailing list