Merge commit '756547ce7f4d67a18663503e2157aebed3531703'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 08:54:17 +0000 (10:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 09:22:28 +0000 (11:22 +0200)
commitdd0429e1de54a6f583384cde010967cad7c10688
treea45a2f73f3b6f5dcefc0ae9efdb7a6203c142e46
parentc589c4c52d130ab07d0b183db129adcc3bb7d39c
parent756547ce7f4d67a18663503e2157aebed3531703
Merge commit '756547ce7f4d67a18663503e2157aebed3531703'

* commit '756547ce7f4d67a18663503e2157aebed3531703':
  avi: DV in AVI must be considered single stream

Conflicts:
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avidec.c