[FFmpeg-cvslog] Merge commit '5f3a081b42b84404a40a52c80ef7a354cf048c56'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Dec  8 09:41:43 2015 +0100| [6a6cfeb2e7c3596a6019563d3ee11c6eead39f22] | committer: Hendrik Leppkes

Merge commit '5f3a081b42b84404a40a52c80ef7a354cf048c56'

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

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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