* commit '797f2a79':
  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: 572965c9
See: 3dbf9afe
See: 6722e564Merged-by: Michael Niedermayer <michaelni@gmx.at>