From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 17 Nov 2015 20:16:30 +0000 (+0100)
Subject: Adapt to the new decode_video_format() prototype.
X-Git-Tag: 1.0.0~101
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=05220ceec712e2dcadb6fbab0efa0b069606531a;p=nageru

Adapt to the new decode_video_format() prototype.
---

diff --git a/bmusb b/bmusb
index ec10aed..cb414fa 160000
--- a/bmusb
+++ b/bmusb
@@ -1 +1 @@
-Subproject commit ec10aedf720f2356035255999827beb4158aa4a2
+Subproject commit cb414fadb0738aeab971cc9b83c322118015d00b
diff --git a/mixer.cpp b/mixer.cpp
index 7ed09e2..4442545 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -220,10 +220,11 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 {
 	CaptureCard *card = &cards[card_index];
 
-	int width, height, frame_rate_nom, frame_rate_den;
+	int width, height, frame_rate_nom, frame_rate_den, extra_lines_top, extra_lines_bottom;
 	bool interlaced;
 
-	decode_video_format(video_format, &width, &height, &frame_rate_nom, &frame_rate_den, &interlaced);  // Ignore return value for now.
+	decode_video_format(video_format, &width, &height, &extra_lines_top, &extra_lines_bottom,
+	                    &frame_rate_nom, &frame_rate_den, &interlaced);  // Ignore return value for now.
 	int64_t frame_length = TIMEBASE * frame_rate_den / frame_rate_nom;
 
 	size_t num_samples = (audio_frame.len >= audio_offset) ? (audio_frame.len - audio_offset) / 8 / 3 : 0;