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

Merge commit 'bd2ab27c' 


* commit 'bd2ab27c':
  avconv: use read_file() for reading the 2pass stats

Conflicts:
	cmdutils.c
	cmdutils.h
	ffmpeg_opt.c

Merged-by: default avatarMichael Niedermayer <michael@niedermayer.cc>
parents 247f4d1f bd2ab27c
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