projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bdcf2b6 5f2c831)
Merge commit '5f2c8315b3c1b28da0386fddb118ad6a0ed77a0c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 18 Nov 2015 16:46:57 +0000 (16:46 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 18 Nov 2015 16:46:57 +0000 (16:46 +0000)
This is a no-op.

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

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

Trivial merge
FFmpeg git repo