]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '7c377f0e74de8ab57f6baa64f3ec197c82104764'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 May 2014 20:02:27 +0000 (22:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 May 2014 20:03:10 +0000 (22:03 +0200)
* commit '7c377f0e74de8ab57f6baa64f3ec197c82104764':
  avisynth: set duration of audio streams

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

Trivial merge