lib/carrierwave/video/ffmpeg_options.rb in carrierwave-video-0.5.5 vs lib/carrierwave/video/ffmpeg_options.rb in carrierwave-video-0.5.6

@@ -40,9 +40,10 @@
       end
 
       # output
       def format_params
         params = @format_options.dup
+        params.delete(:watermark)
         params[:custom] = [params[:custom], watermark_params].compact.join(' ')
         params
       end
 
       def watermark?