src/dvbpsi.c

@@ -211,7 +211,7 @@ bool dvbpsi_decoder_psi_section_add(dvbpsi_decoder_t *p_decoder, dvbpsi_psi_sect
     /* Add to end of list */
     if (p_prev->i_number < p_section->i_number)
     {
-        p_decoder->i_last_section_number = p_section->i_number;
+        p_decoder->i_last_section_number = p_section->i_last_number;
         p_prev->p_next = p_section;
         p_section->p_next = NULL;
     }

src/psi.c

@@ -215,8 +215,9 @@ bool dvbpsi_CheckPSISection(dvbpsi_t *p_dvbpsi, dvbpsi_psi_section_t *p_section,
     }
 
     dvbpsi_debug(p_dvbpsi, psz_table_name,
-                   "Table version %2d, " "i_extension %5d, "
+                   "Table %3d version %2d, " "i_extension %5d, "
                    "section %3d up to %3d, " "current %1d",
+                   p_section->i_table_id,
                    p_section->i_version, p_section->i_extension,
                    p_section->i_number, p_section->i_last_number,
                    p_section->b_current_next);

src/tables/eit.c

@@ -318,8 +318,9 @@ static bool dvbpsi_CheckEIT(dvbpsi_t *p_dvbpsi, dvbpsi_eit_decoder_t *p_eit_deco
     {
         /* last_section_number */
         dvbpsi_error(p_dvbpsi, "EIT decoder",
-                     "'last_section_number' differs"
-                     " whereas no discontinuity has occured");
+                     "'last_section_number' differs %2d / %2d "
+                     " whereas no discontinuity has occurred",
+                     p_eit_decoder->i_last_section_number, p_section->i_last_number);
         b_reinit = true;
     }
 
@@ -405,7 +406,6 @@ static bool dvbpsi_AddSectionEIT(dvbpsi_t *p_dvbpsi, dvbpsi_eit_decoder_t *p_eit
 
         if (p_eit_decoder->p_building_eit == NULL)
             return false;
-        p_eit_decoder->i_last_section_number = p_section->i_last_number;
     }
 
     /* Add to linked list of sections */