Skip to content

Commit

Permalink
chore(release): 6.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
bajankristof authored Jun 19, 2024
2 parents fc5278f + f610951 commit 4fedfad
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
== 6.0.2 2024-06-18

Fixes:
* Fixed a crash where extremely long media files would cause the transcoder to fail with SystemStackError: stack level too deep

== 6.0.1 2024-06-05

Fixes:
Expand Down
10 changes: 4 additions & 6 deletions lib/ffmpeg/timeout.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ def pause

def resume
@paused = false
tick
end

def tick
Expand All @@ -42,12 +43,9 @@ def initialize(duration, message = nil)
end

def loop
if !@paused && Time.now - @last_tick >= @duration
@current_thread.raise(::Timeout::Error, @message || self.class.name)
else
sleep 0.1
loop
end
sleep 0.1 while @paused || Time.now - @last_tick <= @duration

@current_thread.raise(::Timeout::Error, @message || self.class.name)
end
end
end
2 changes: 1 addition & 1 deletion lib/ffmpeg/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module FFMPEG
VERSION = '6.0.1'
VERSION = '6.0.2'
end

0 comments on commit 4fedfad

Please sign in to comment.