[vlc-commits] [Git][videolan/vlc][master] 6 commits: input: remove gone qtcapture scheme

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
39f108c1 by Marvin Scholz at 2022-03-26T09:54:37+00:00
input: remove gone qtcapture scheme

- - - - -
38ef2ec1 by Marvin Scholz at 2022-03-26T09:54:37+00:00
input: add missing avcapture scheme

Used by the "new" AVFoundation-based capture module.

- - - - -
7c15eaa6 by Marvin Scholz at 2022-03-26T09:54:37+00:00
input: remove gone eyetv scheme

- - - - -
99d74f1b by Marvin Scholz at 2022-03-26T09:54:37+00:00
input: remove gone usdigital scheme

- - - - -
10aae615 by Marvin Scholz at 2022-03-26T09:54:37+00:00
demux: ts: remove check for gone usdigital access

- - - - -
f485b52b by Marvin Scholz at 2022-03-26T09:54:37+00:00
access: dvb: remove check for gone usdigital access

- - - - -


3 changed files:

- modules/access/dvb/linux_dvb.c
- modules/demux/mpeg/ts.c
- src/input/item.c


Changes:

=====================================
modules/access/dvb/linux_dvb.c
=====================================
@@ -153,8 +153,7 @@ int FrontendOpen( vlc_object_t *p_access, dvb_sys_t *p_sys, const char *psz_acce
             psz_expected = "DVB-T";
         }
 
-        if( (!strncmp( psz_access, "usdigital", 9 ) ||
-             !strncmp( psz_access, "atsc", 4 ) ) &&
+        if( !strncmp( psz_access, "atsc", 4 ) &&
              (p_frontend->info.type != FE_ATSC) )
         {
             psz_expected = "ATSC";
@@ -184,8 +183,7 @@ int FrontendOpen( vlc_object_t *p_access, dvb_sys_t *p_sys, const char *psz_acce
         else if( !strncmp( psz_access, "terrestrial", 11 ) ||
                  !strncmp( psz_access, "dvb-t", 5 ) )
             p_frontend->info.type = FE_OFDM;
-        else if( !strncmp( psz_access, "usdigital", 9 ) ||
-                 !strncmp( psz_access, "atsc", 4 ) )
+        else if( !strncmp( psz_access, "atsc", 4 ) )
             p_frontend->info.type = FE_ATSC;
     }
 


=====================================
modules/demux/mpeg/ts.c
=====================================
@@ -521,8 +521,7 @@ static int Open( vlc_object_t *p_this )
     }
 
     if( p_sys->standard == TS_STANDARD_AUTO &&
-       ( !strncasecmp( p_demux->psz_url, "atsc", 4 ) ||
-         !strncasecmp( p_demux->psz_url, "usdigital", 9 ) ) )
+       !strncasecmp( p_demux->psz_url, "atsc", 4 ) )
     {
         TsChangeStandard( p_sys, TS_STANDARD_ATSC );
     }


=====================================
src/input/item.c
=====================================
@@ -1142,6 +1142,7 @@ static enum input_item_type_e GuessType( const input_item_t *p_item, bool *p_net
         /* Short match work, not just exact match */
         { "alsa",   ITEM_TYPE_CARD, false },
         { "atsc",   ITEM_TYPE_CARD, false },
+        { "avcapt", ITEM_TYPE_CARD, false }, /* AVCapture */
         { "bd",     ITEM_TYPE_DISC, false },
         { "bluray", ITEM_TYPE_DISC, false },
         { "cable",  ITEM_TYPE_CARD, false },
@@ -1155,7 +1156,6 @@ static enum input_item_type_e GuessType( const input_item_t *p_item, bool *p_net
         { "dtv",    ITEM_TYPE_CARD, false },
         { "dvb",    ITEM_TYPE_CARD, false },
         { "dvd",    ITEM_TYPE_DISC, false },
-        { "eyetv",  ITEM_TYPE_CARD, false },
         { "fd",     ITEM_TYPE_UNKNOWN, false },
         { "file",   ITEM_TYPE_FILE, false },
         { "ftp",    ITEM_TYPE_FILE, true },
@@ -1177,7 +1177,6 @@ static enum input_item_type_e GuessType( const input_item_t *p_item, bool *p_net
         { "pulse",  ITEM_TYPE_CARD, false },
         { "qam",    ITEM_TYPE_CARD, false },
         { "qpsk",   ITEM_TYPE_CARD, false },
-        { "qtcapt", ITEM_TYPE_CARD, false }, /* qtcapture */
         { "qtsound",ITEM_TYPE_CARD, false },
         { "raw139", ITEM_TYPE_CARD, false }, /* raw1394 */
         { "rt",     ITEM_TYPE_STREAM, true }, /* rtp, rtsp, rtmp */
@@ -1195,7 +1194,6 @@ static enum input_item_type_e GuessType( const input_item_t *p_item, bool *p_net
         { "udp",    ITEM_TYPE_STREAM, true },  /* udplite too */
         { "unsv",   ITEM_TYPE_STREAM, true },
         { "upnp",   ITEM_TYPE_FILE, true },
-        { "usdigi", ITEM_TYPE_CARD, false }, /* usdigital */
         { "v4l",    ITEM_TYPE_CARD, false },
         { "vcd",    ITEM_TYPE_DISC, false },
         { "vdr",    ITEM_TYPE_STREAM, true },



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9089021db17a3e739b59a7666b057b9442793982...f485b52be2410d2f7890d180481230df3250383d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9089021db17a3e739b59a7666b057b9442793982...f485b52be2410d2f7890d180481230df3250383d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance