Merge commit '1cac9accbd1f9b8596122d0735e37b97a844c514'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 08:38:46 +0000 (10:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 08:40:33 +0000 (10:40 +0200)
* commit '1cac9accbd1f9b8596122d0735e37b97a844c514':
  avi: properly fail if the dv demuxer is missing

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

Simple merge