[FFmpeg-cvslog] Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'

Michael Niedermayer git at videolan.org
Sat Sep 27 02:12:05 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 27 01:49:24 2014 +0200| [ac6b5bb834c0c3221fbdd1f74916d332157bfd39] | committer: Michael Niedermayer

Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'

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

Conflicts:
	ffmpeg.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac6b5bb834c0c3221fbdd1f74916d332157bfd39
---





More information about the ffmpeg-cvslog mailing list