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

Merge commit '3d624420' 


* commit '3d624420':
  avconv_opt: allocate an OutputFile before the streams.

Conflicts:
	ffmpeg_opt.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 3319679d 3d624420
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 32 deletions
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