[FFmpeg-cvslog] Merge commit '7c377f0e74de8ab57f6baa64f3ec197c82104764'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 16 22:02:27 2014 +0200| [eb580d25986fbf5d95caab3dd6ea0593229c77af] | committer: Michael Niedermayer

Merge commit '7c377f0e74de8ab57f6baa64f3ec197c82104764'

* commit '7c377f0e74de8ab57f6baa64f3ec197c82104764':
  avisynth: set duration of audio streams

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

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