Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ffmpeg output parser fix #257

Merged
merged 1 commit into from
May 7, 2015
Merged

ffmpeg output parser fix #257

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions converter/ffmpeg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,10 @@ def on_sigalrm(*_):
signal.alarm(0)

if not ret:
#For small or very fast jobs, ffmpeg may never output a '\r'. When EOF is reached, yield if we haven't yet.
if not yielded:
yielded = True
yield 10
break

try:
Expand Down