diff --git a/src/DummyReader.cpp b/src/DummyReader.cpp
index d8d7d694..6913e3fe 100644
--- a/src/DummyReader.cpp
+++ b/src/DummyReader.cpp
@@ -38,7 +38,7 @@ void DummyReader::init(Fraction fps, int width, int height, int sample_rate, int
 	// Set key info settings
 	info.has_audio = false;
 	info.has_video = true;
-	info.file_size = static_cast<size_t>(width * height * sizeof(int));
+	info.file_size = static_cast<size_t>(width) * height * sizeof(int);
 	info.vcodec = "raw";
 	info.fps = fps;
 	info.width = width;
diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp
index c5c72a63..714c8dbd 100644
--- a/src/FFmpegReader.cpp
+++ b/src/FFmpegReader.cpp
@@ -1537,10 +1537,9 @@ void FFmpegReader::ProcessAudioPacket(int64_t requested_frame, int64_t target_fr
 	// Copy audio samples over original samples
 	memcpy(audio_buf,
 	       audio_converted->data[0],
-	       static_cast<size_t>(
-	           audio_converted->nb_samples
+	       static_cast<size_t>(audio_converted->nb_samples)
 	           * av_get_bytes_per_sample(AV_SAMPLE_FMT_S16)
-	           * info.channels)
+	           * info.channels
 	      );
 
 	// Deallocate resample buffer
diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp
index 33c6da82..433a2f33 100644
--- a/src/FFmpegWriter.cpp
+++ b/src/FFmpegWriter.cpp
@@ -1673,9 +1673,9 @@ void FFmpegWriter::write_audio_packets(bool is_final) {
 
         // Copy audio samples over original samples
         memcpy(all_resampled_samples, audio_converted->data[0],
-               static_cast<size_t>(
-                   nb_samples * info.channels
-                   * av_get_bytes_per_sample(output_sample_fmt)));
+               static_cast<size_t>(nb_samples)
+                   * info.channels
+                   * av_get_bytes_per_sample(output_sample_fmt));
 
         // Remove converted audio
         av_freep(&(audio_frame->data[0]));
@@ -1709,8 +1709,8 @@ void FFmpegWriter::write_audio_packets(bool is_final) {
                        av_get_bytes_per_sample(AV_SAMPLE_FMT_S16) )
                 ),
                 all_resampled_samples + samples_position,
-                static_cast<size_t>(
-                    diff * av_get_bytes_per_sample(output_sample_fmt))
+                static_cast<size_t>(diff)
+                    * av_get_bytes_per_sample(output_sample_fmt)
             );
 
         // Increment counters
@@ -1765,9 +1765,9 @@ void FFmpegWriter::write_audio_packets(bool is_final) {
 
             // Copy audio into buffer for frame
             memcpy(final_samples_planar, samples,
-                   static_cast<size_t>(
-                       audio_frame->nb_samples * info.channels
-                       * av_get_bytes_per_sample(output_sample_fmt)));
+                   static_cast<size_t>(audio_frame->nb_samples)
+                       * info.channels
+                       * av_get_bytes_per_sample(output_sample_fmt));
 
             // Fill input frame with sample data
             avcodec_fill_audio_frame(audio_frame, info.channels, output_sample_fmt,
@@ -1793,10 +1793,9 @@ void FFmpegWriter::write_audio_packets(bool is_final) {
             );
 
             // Copy audio samples over original samples
-            const auto copy_length = static_cast<size_t>(
-                nb_samples
+            const auto copy_length = static_cast<size_t>(nb_samples)
                 * av_get_bytes_per_sample(audio_codec_ctx->sample_fmt)
-                * info.channels);
+                * info.channels;
 
             if (nb_samples > 0)
                 memcpy(samples, frame_final->data[0], copy_length);
@@ -1810,10 +1809,9 @@ void FFmpegWriter::write_audio_packets(bool is_final) {
 
         } else {
             // Create a new array
-            const auto buf_size = static_cast<size_t>(
-                audio_input_position
+            const auto buf_size = static_cast<size_t>(audio_input_position)
                 * (av_get_bytes_per_sample(audio_codec_ctx->sample_fmt) /
-                   av_get_bytes_per_sample(AV_SAMPLE_FMT_S16))
+                   av_get_bytes_per_sample(AV_SAMPLE_FMT_S16)
                 );
             final_samples = reinterpret_cast<int16_t*>(
                     av_malloc(sizeof(int16_t) * buf_size));