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

Merge commit '47543450' 


* commit '47543450':
  avconv: print verbose per-stream transcoding statistics

Conflicts:
	ffmpeg.c

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