Merge commit '628ce8b8b6b80cb3985d39e195b71b9d7fad9008'
authorJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 17:34:24 +0000 (14:34 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 17:34:24 +0000 (14:34 -0300)
commit4c0a8ff0610c15cb1ceeca037d6b7c8fd3b2420a
tree3dafc73afaac1afbe40289a12f1cda665043ac55
parent072b14f390472ef79a346feb43cf1ae0b372e6d6
parent628ce8b8b6b80cb3985d39e195b71b9d7fad9008
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@gmail.com>