Merge commit '91760a934055ab06812885ab5ec1a97a8db6d217'
authorJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:17:23 +0000 (00:17 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:17:23 +0000 (00:17 -0300)
* commit '91760a934055ab06812885ab5ec1a97a8db6d217':
  dashenc: copy stream frame rate to output stream

This commit is a noop, see 3c838e6442bbe1afb7bf82942471342bcea87a27

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge