李帅

1.继续调试ffmpeg命令

...@@ -67,7 +67,7 @@ class MakeVideo implements ShouldQueue ...@@ -67,7 +67,7 @@ class MakeVideo implements ShouldQueue
67 67
68 // 转换logo大小 68 // 转换logo大小
69 // $watermark = $this->translateLogo(Storage::disk('public')->path('image/logo.jpg')); 69 // $watermark = $this->translateLogo(Storage::disk('public')->path('image/logo.jpg'));
70 - $watermark = Storage::disk('public')->path('ffmpeg/LOGO_eng.png'); 70 + $watermark = Storage::disk('public')->path('image/logo.png');
71 71
72 // 生成贴纸和签名 72 // 生成贴纸和签名
73 $end_wallpaper = $this->wallpaperWithSignature($end_wallpaper, $thumbnail, $signature, $font); 73 $end_wallpaper = $this->wallpaperWithSignature($end_wallpaper, $thumbnail, $signature, $font);
......