Skip to content
Snippets Groups Projects
Commit b7fc2693 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '488a0fa6' 


* commit '488a0fa6':
  avconv: support -t as an input option.

Conflicts:
	Changelog
	ffmpeg.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 6d77279e 488a0fa6
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment