[FFmpeg-cvslog] Merge commit '797f2a791397210ec1b591b326658805c5dbf104'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 14 22:15:10 2013 +0100| [6659364d3a4778b37421e35c10d9205343f0fa8d] | committer: Michael Niedermayer

Merge commit '797f2a791397210ec1b591b326658805c5dbf104'

* commit '797f2a791397210ec1b591b326658805c5dbf104':
  hdsenc: Check the init_file() return code
  hdsenc: Fix an off by one error in an array size check
  hdsenc: Avoid integer overflow

Conflicts:
	libavformat/hdsenc.c

See: 572965c9a6b8173d918dea392aadfee1d44d7f47
See: 3dbf9afe857d480993786bea0ede9dd9526776d2
See: 6722e564a82bac471d92b02550b5017c09b539ba
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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