Adapt to the new decode_video_format() prototype.

diff --git a/bmusb b/bmusb
index ec10aedf720f2356035255999827beb4158aa4a2..cb414fadb0738aeab971cc9b83c322118015d00b 160000 (submodule)
--- a/bmusb
+++ b/bmusb
@@ -1 +1 @@
-Subproject commit ec10aedf720f2356035255999827beb4158aa4a2
+Subproject commit cb414fadb0738aeab971cc9b83c322118015d00b

diff --git a/mixer.cpp b/mixer.cpp
index 7ed09e20b06ccf36bbddf754753662f260cb0d27..44425455aef52e78993aa1992acf1850be4b0f97 100644 (file)
--- 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;