[vlc-commits] demux: ts: rename hdxx registrations

Francois Cartegnie git at videolan.org
Sun Jan 24 19:23:00 CET 2016


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Jan 24 16:39:52 2016 +0100| [f0591e8a53f96902f427725d883ce54df35f7c5a] | committer: Francois Cartegnie

demux: ts: rename hdxx registrations

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f0591e8a53f96902f427725d883ce54df35f7c5a
---

 modules/demux/mpeg/ts.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index f15f95c..4405b96 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -291,7 +291,7 @@ typedef struct
 typedef enum
 {
     TS_PMT_REGISTRATION_NONE = 0,
-    TS_PMT_REGISTRATION_HDMV
+    TS_PMT_REGISTRATION_BLURAY,
 } ts_pmt_registration_type_t;
 
 typedef enum
@@ -5207,7 +5207,7 @@ static void FillPESFromDvbpsiES( demux_t *p_demux,
     bool b_registration_applied = false;
     if ( p_dvbpsies->i_type >= 0x80 ) /* non standard, extensions */
     {
-        if ( registration_type == TS_PMT_REGISTRATION_HDMV )
+        if ( registration_type == TS_PMT_REGISTRATION_BLURAY )
         {
             if (( b_registration_applied = PMTSetupEsHDMV( p_demux, p_pes->p_es, p_dvbpsies ) ))
                 msg_Dbg( p_demux, "    + HDMV registration applied to pid %d type 0x%x",
@@ -5301,8 +5301,8 @@ static void ParsePMTRegistrations( demux_t *p_demux, const dvbpsi_descriptor_t
                     const char rgs[4];
                     const ts_pmt_registration_type_t reg;
                 } regs[] = {
-                    { { 'H', 'D', 'M', 'V' }, TS_PMT_REGISTRATION_HDMV }, /* Blu-Ray */
-                    { { 'H', 'D', 'P', 'R' }, TS_PMT_REGISTRATION_HDMV }, /* Blu-Ray */
+                    { { 'H', 'D', 'M', 'V' }, TS_PMT_REGISTRATION_BLURAY },
+                    { { 'H', 'D', 'P', 'R' }, TS_PMT_REGISTRATION_BLURAY },
                 };
 
                 for( unsigned i=0; i<ARRAY_SIZE(regs); i++ )



More information about the vlc-commits mailing list