Merge commit '8e67039c6312ba520945f2c01b7b14df056d5ed1'
authorJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 21:50:30 +0000 (18:50 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 21:50:30 +0000 (18:50 -0300)
commite666c2b5ec978b0b10ed69ca34a3ed831bd0242d
tree03275350f50955482ab54c21583709bb3cc54a03
parent0c005fa86f01df75be8c9cacad7530978af80900
parent8e67039c6312ba520945f2c01b7b14df056d5ed1
Merge commit '8e67039c6312ba520945f2c01b7b14df056d5ed1'

* commit '8e67039c6312ba520945f2c01b7b14df056d5ed1':
  asfdec: Use the ASF stream count when iterating

Merged-by: James Almer <jamrial@gmail.com>
libavformat/asfdec_o.c