Michael Niedermayer 6659364d3a 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: 572965c9a6
See: 3dbf9afe85
See: 6722e564a8
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-12-14 22:17:17 +01:00

20 KiB

Raw Blame History

View Raw