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

Merge commit 'a220b07b' 


* commit 'a220b07b':
  avconv: split printing the final statistics into a separate function

Conflicts:
	ffmpeg.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents ecb5b9c0 a220b07b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 37 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