]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '0fc61c6ab6912a2f0c40fdd3f3c591bc2a33efd4'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Dec 2015 15:00:47 +0000 (16:00 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Dec 2015 15:00:47 +0000 (16:00 +0100)
* commit '0fc61c6ab6912a2f0c40fdd3f3c591bc2a33efd4':
  avi: Validate the stream-id for DV as well

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

Trivial merge