Skip to content
Merged
Changes from all commits
Commits
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
Check and cancel FFmpegExecuteAsyncTask if cancelled
  • Loading branch information
gmxu committed Jan 9, 2015
commit d5303692e7d6ebcd44ce6fb2cedddf2f569485b2
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ private void checkAndUpdateProcess() throws TimeoutException, InterruptedExcepti
String line;
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()));
while ((line = reader.readLine()) != null) {
if (isCancelled()) {
return;
}

output += line+"\n";
publishProgress(line);
}
Expand Down