diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2020-09-29 15:52:21 +0300 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2020-10-05 09:33:34 +0000 |
| commit | 83856c25bfda34489dec85b213e7203a77272007 (patch) | |
| tree | e6fa30cf75ff94d4c0aaa234d0f6872a7d44c70e /sys | |
| parent | 24fcf24c6f96506301ed478210c5a9b1f6cbe7ed (diff) | |
| download | gstreamer-plugins-bad-83856c25bfda34489dec85b213e7203a77272007.tar.gz | |
decklink: Correctly order the different dependent mode tables
One was forgotten in 309f6187fef890c7ffa49305f38e89beac3b1423.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1652>
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/decklink/gstdecklink.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp index 4dac7e17b..7742aa437 100644 --- a/sys/decklink/gstdecklink.cpp +++ b/sys/decklink/gstdecklink.cpp @@ -283,12 +283,6 @@ static const GstDecklinkMode modes[] = { {bmdModeNTSCp, 720, 486, 30000, 1001, false, NTSC}, {bmdModePALp, 720, 576, 25, 1, false, PAL}, - {bmdModeNTSC, 720, 486, 30000, 1001, true, NTSC_WS}, - {bmdModeNTSC2398, 720, 486, 24000, 1001, true, NTSC_WS}, - {bmdModePAL, 720, 576, 25, 1, true, PAL_WS}, - {bmdModeNTSCp, 720, 486, 30000, 1001, false, NTSC_WS}, - {bmdModePALp, 720, 576, 25, 1, false, PAL_WS}, - {bmdModeHD1080p2398, 1920, 1080, 24000, 1001, false, HD}, {bmdModeHD1080p24, 1920, 1080, 24, 1, false, HD}, {bmdModeHD1080p25, 1920, 1080, 25, 1, false, HD}, @@ -327,7 +321,13 @@ static const GstDecklinkMode modes[] = { {bmdMode4K2160p30, 3840, 2160, 30, 1, false, UHD}, {bmdMode4K2160p50, 3840, 2160, 50, 1, false, UHD}, {bmdMode4K2160p5994, 3840, 2160, 60000, 1001, false, UHD}, - {bmdMode4K2160p60, 3840, 2160, 60, 1, false, UHD} + {bmdMode4K2160p60, 3840, 2160, 60, 1, false, UHD}, + + {bmdModeNTSC, 720, 486, 30000, 1001, true, NTSC_WS}, + {bmdModeNTSC2398, 720, 486, 24000, 1001, true, NTSC_WS}, + {bmdModePAL, 720, 576, 25, 1, true, PAL_WS}, + {bmdModeNTSCp, 720, 486, 30000, 1001, false, NTSC_WS}, + {bmdModePALp, 720, 576, 25, 1, false, PAL_WS} }; static const struct |