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

Merge commit '9580818c' 


* commit '9580818c':
  avconv: rename OutputStream.opts to OutputStream.encoder_opts

Conflicts:
	ffmpeg.c
	ffmpeg.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 22ffa539 9580818c
No related branches found
No related tags found
No related merge requests 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