[FFmpeg-cvslog] Merge commit '0fc61c6ab6912a2f0c40fdd3f3c591bc2a33efd4'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Dec  7 16:00:47 2015 +0100| [8cfa7beffc5cb0f38766ff61b7af333e40aeeffe] | committer: Hendrik Leppkes

Merge commit '0fc61c6ab6912a2f0c40fdd3f3c591bc2a33efd4'

* commit '0fc61c6ab6912a2f0c40fdd3f3c591bc2a33efd4':
  avi: Validate the stream-id for DV as well

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

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