Merge commit '5f3a081b42b84404a40a52c80ef7a354cf048c56'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Dec 2015 08:41:43 +0000 (09:41 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Dec 2015 08:41:43 +0000 (09:41 +0100)
commit6a6cfeb2e7c3596a6019563d3ee11c6eead39f22
treec035f95ad9d27cfe8c84a0549e48beb9cc6e05ab
parent5aca33c2cfc39e23fc977df1b0aed720c7043574
parent5f3a081b42b84404a40a52c80ef7a354cf048c56
Merge commit '5f3a081b42b84404a40a52c80ef7a354cf048c56'

* commit '5f3a081b42b84404a40a52c80ef7a354cf048c56':
  avi: Spin out the logic to position to the next non-interleaved stream

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/avidec.c