lib/carrierwave/video/ffmpeg_options.rb in carrierwave-video-0.5.3 vs lib/carrierwave/video/ffmpeg_options.rb in carrierwave-video-0.5.4

@@ -22,10 +22,13 @@
       def logger(model)
         model.send(@logger) if @logger.present?
       end
 
       def progress(model)
-        lambda {|val| model.send(@progress, val)} if @progress
+        if @progress
+          args = model.method(@progress).arity == 3 ? [@format, @format_options] : []
+          lambda { |val| model.send(@progress, *(args + [val])) }
+        end
       end
 
       def encoder_options
         { preserve_aspect_ratio: :width }
       end