Merge branch 'master' of https://github.com/olive-editor/olive

app/codec/ffmpeg/ffmpegdecoder.cpp

@@ -445,7 +445,7 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)
   // Result to return
   bool result = false;
 
-  // Convert QString to a C strng
+  // Convert QString to a C string
   QByteArray ba = f->filename().toUtf8();
   const char* filename = ba.constData();
 
@@ -737,7 +737,7 @@ void FFmpegDecoder::UnconditionalAudioIndex(const QAtomicInt* cancelled)
 
         } else {
 
-          // No resampling required, we can write directly from te frame buffer
+          // No resampling required, we can write directly from the frame buffer
           data = reinterpret_cast<char*>(frame->data[0]);
           nb_samples = frame->nb_samples;
 

app/codec/ffmpeg/ffmpegencoder.cpp

@@ -53,7 +53,7 @@ void FFmpegEncoder::WriteAudio(AudioRenderingParams pcm_info, const QString &pcm
         // If we're encoding video, use enough samples to cover roughly one frame of video
         maximum_frame_samples = params().audio_params().time_to_samples(params().video_params().time_base());
       } else {
-        // If no video, just use an arbitary number
+        // If no video, just use an arbitrary number
         maximum_frame_samples = 256;
       }
     }

app/node/metareader.cpp

@@ -187,7 +187,7 @@ void NodeMetaReader::XMLReadIterations(QXmlStreamReader* reader)
   if (iterations_ > 0) {
     iterations_ = iteration_pickup;
   } else {
-    // If the iteration value is invalid, don't set it, print an error insteead
+    // If the iteration value is invalid, don't set it, print an error instead
     qWarning() << "Invalid iteration number in" << xml_filename_ << "- setting to default (1)";
   }
 }

app/widget/timeruler/seekablewidget.h

@@ -88,7 +88,7 @@ protected:
 
 signals:
   /**
-   * @brief Signal emitted whenever the time changes on this ruler, either by user or programatically
+   * @brief Signal emitted whenever the time changes on this ruler, either by user or programmatically
    */
   void TimeChanged(int64_t);