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

Merge commit '6cfbe1de' 


* commit '6cfbe1de':
  avconv: Use only audio and video to guess discontinuities

Conflicts:
	ffmpeg.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 26cd7b1e 6cfbe1de
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 9 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment