ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac6b5bb834c0c3221fbdd1f74916d332157bfd39
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
