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)
commit34cfb73b9928daf3104fe85a961ca3a1389ec076
tree47e52affc69812ed7264d7b502c1ff63b87f166b
parent362372c46be6f4b885f741271687f2dae6435db9
parent91760a934055ab06812885ab5ec1a97a8db6d217
Merge commit '91760a934055ab06812885ab5ec1a97a8db6d217'

* commit '91760a934055ab06812885ab5ec1a97a8db6d217':
  dashenc: copy stream frame rate to output stream

This commit is a noop, see 3c838e6442bbe1afb7bf82942471342bcea87a27

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