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

Merge commit 'fb722a90' 


* commit 'fb722a90':
  avconv: remove -same_quant

Conflicts:
	Changelog
	doc/faq.texi
	ffmpeg.c
	ffmpeg.h
	ffmpeg_opt.c

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