[FFmpeg-cvslog] Merge commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 14:51:02 2013 +0200| [6c18775bae785353dbe25508cab127629f9910a7] | committer: Michael Niedermayer

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 at gmx.at>

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