Add optional timeout argument to probe#283

kkroening merged 2 commits intokkroening:masterkkroening/ffmpeg-python:masterfrom

magnusvmt:mastermagnusvmt/ffmpeg-python:masterCopy head branch name to clipboard