Merge commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 09:17:21 +0000 (11:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 09:19:38 +0000 (11:19 +0200)
commit7e88dbe9358fd108dd565c994b6020b95d50c57a
treed8b180c5338daee4ec214757cc856705646e5e77
parentae77f06c691d122880dccd808b206b557141aaa7
parent48d6556dd46d4f4fac10d0f4a819e314887cd50e
Merge commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e'

* commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e':
  dsicin: Add some basic sanity checks for fields read from the file

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