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

Merge commit 'b4a5a292' 


* commit 'b4a5a292':
  avconv: improve -re implementation

Conflicts:
	ffmpeg.c

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