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

Merge commit 'f3a6ad22' 


* commit 'f3a6ad22':
  avconv: rename InputStream.opts to InputStream.decoder_opts

Conflicts:
	ffmpeg.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 6e397074 f3a6ad22
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