Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 20:34:53 +0000 (22:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 20:38:44 +0000 (22:38 +0200)
commit6cfaa51acbf7f604ff94a3bc6e564855e7813b3a
tree8411b6265cfa2a786f1e582ba323f60042fbc6cd
parent449c74f629cb35cfd88b5d2b0d7accf0df225bc0
parenta9b2a51178ea446909015f061ab5df65e3b66bf6
Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'

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

Conflicts:
ffmpeg_opt.c

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