Merge branch 'master' of git.videolan.org:bitstream

dvb/si/desc_83p28.h

@@ -103,7 +103,7 @@ static inline void desc83p28_print(uint8_t *p_desc, f_print pf_print,
             break;
         default:
             pf_print(opaque,
-            "    - desc %hhu lcn sid=%hu%s lcn=%hu", desc_get_tag(p_desc),
+            "    - desc %hhx lcn sid=%hu%s lcn=%hu", desc_get_tag(p_desc),
             desc83p28n_get_sid(p_desc_n),
             desc83p28n_get_visible(p_desc_n) ? " visible" : "",
             desc83p28n_get_lcn(p_desc_n));

mpeg/psi/descs_print.h

@@ -55,8 +55,8 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
         j++;
 
         desc_print_begin(p_desc, pf_print, print_opaque, i_print_type);
-
-        if (i_private_data_specifier == 0x28) {
+        if (i_private_data_specifier == 0x28 ||
+            i_private_data_specifier == 0x233a) {
             /* EICTA */
             switch (i_tag) {
 #define CASE_DESC(id)                                                       \