[FFmpeg-cvslog] Merge commit '5f2c8315b3c1b28da0386fddb118ad6a0ed77a0c'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Nov 18 16:46:57 2015 +0000| [518742bc21f7baa4c9059e9705fca131d4e3a87a] | committer: Derek Buitenhuis

Merge commit '5f2c8315b3c1b28da0386fddb118ad6a0ed77a0c'

This is a no-op.

* commit '5f2c8315b3c1b28da0386fddb118ad6a0ed77a0c':
  thp: set duration for audio stream too

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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