Merge commit 'a9b2a511'

* commit 'a9b2a511':
  avconv_opt: Check localtime() return value

Conflicts:
	ffmpeg_opt.c

See: 8e91d965
Merged-by: Michael Niedermayer <michaelni@gmx.at>