mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 05:56:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

decklink: Correctly order the different dependent mode tables

Browse source 
One was forgotten in 309f6187fe.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1617>
This commit is contained in:
Sebastian Dröge 2020-09-29 15:52:21 +03:00 committed by GStreamer Merge Bot
parent a668de747f
commit 97e648a738
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/plugins/gst_plugins_cache.json
View file

File diff suppressed because one or more lines are too long

14
sys/decklink/gstdecklink.cpp
View file

@ -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