[FFmpeg-cvslog] Merge commit '91760a934055ab06812885ab5ec1a97a8db6d217'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Nov 12 00:17:23 2017 -0300| [34cfb73b9928daf3104fe85a961ca3a1389ec076] | committer: James Almer

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 at gmail.com>

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