Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 23:49:24 +0000 (01:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Sep 2014 00:06:39 +0000 (02:06 +0200)
commitac6b5bb834c0c3221fbdd1f74916d332157bfd39
treef6cab48a5f596f3fce5f6da3f1d2a608f98ac144
parent26cd7b1e1ad54dca688b5d62081cd79c4f56a387
parent6cfbe1de5ac6c57c41459626f7ac32841d63ace8
Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'

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

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c