[FFmpeg-cvslog] Merge commit '628ce8b8b6b80cb3985d39e195b71b9d7fad9008'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 21 14:34:24 2017 -0300| [4c0a8ff0610c15cb1ceeca037d6b7c8fd3b2420a] | committer: James Almer

Merge commit '628ce8b8b6b80cb3985d39e195b71b9d7fad9008'

* commit '628ce8b8b6b80cb3985d39e195b71b9d7fad9008':
  flvdec: Set avg_frame_rate for video streams

This commit is a noop, see e0791c5aaf1c12601322e410119ca46c6d09981d

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

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