merged with master

2019-03-25 12:43:23 +11:00
parent e2c5c87a0a a3c1342f77
commit 93c009c7fd
83 changed files with 7823 additions and 1469 deletions
@@ -62,9 +62,7 @@ struct FootageStream {
  // preview thumbnail/waveform
  bool preview_done;
  QImage video_preview;
-  QIcon video_preview_square;
  QVector<char> audio_preview;
-  void make_square_thumb();
 };

 struct Footage {