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

Merge commit 'baeb59d8' 


* commit 'baeb59d8':
  avconv: rewrite output data size tracking

Conflicts:
	ffmpeg.c

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