[FFmpeg-cvslog] Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 12 22:34:53 2015 +0200| [6cfaa51acbf7f604ff94a3bc6e564855e7813b3a] | committer: Michael Niedermayer

Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'

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

Conflicts:
	ffmpeg_opt.c

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

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