Merge commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 12:51:02 +0000 (14:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 12:51:02 +0000 (14:51 +0200)
commit6c18775bae785353dbe25508cab127629f9910a7
tree5d9613d1465d97804635c116ed5f2759e6246cb6
parent09b09ef4ab5c20feb815cb6ef7a297b8c046f44e
parent83c285f88016b087c2f0f4b9ef356ad8ef12d947
Merge commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947'

* commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947':
  wtv: Add more sanity checks for a length read from the file

Conflicts:
libavformat/wtv.c

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