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

Merge commit '6d5d9246' 


* commit '6d5d9246':
  avconv: move handling the 2pass logfile into avconv_opt

Conflicts:
	ffmpeg.c

Merged-by: default avatarMichael Niedermayer <michael@niedermayer.cc>
parents db3e12a8 6d5d9246
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