[vlc-commits] ts: dvbpsi: don't spam with irrelevant errors

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Mar 16 17:11:40 2015 +0100| [4da7c465a67c5c02bed7bf8cb226157fcc1bd118] | committer: Francois Cartegnie

ts: dvbpsi: don't spam with irrelevant errors

should be fixed from libdvbpsi >= 1.2.0

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

 modules/mux/mpeg/dvbpsi_compat.h |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/mux/mpeg/dvbpsi_compat.h b/modules/mux/mpeg/dvbpsi_compat.h
index f58458b..1921cf2 100644
--- a/modules/mux/mpeg/dvbpsi_compat.h
+++ b/modules/mux/mpeg/dvbpsi_compat.h
@@ -30,7 +30,15 @@ static inline void dvbpsi_messages(dvbpsi_t *p_dvbpsi, const dvbpsi_msg_level_t
     /* See dvbpsi.h for the definition of these log levels.*/
     switch(level)
     {
-        case DVBPSI_MSG_ERROR: msg_Err( obj, "%s", msg ); break;
+        case DVBPSI_MSG_ERROR:
+        {
+#if DVBPSI_VERSION_INT <= ((1 << 16) + (2 << 8))
+            if( strncmp( msg, "libdvbpsi (PMT decoder): ", 25 ) ||
+                ( strncmp( &msg[25], "invalid section", 15 ) &&
+                  strncmp( &msg[25], "'program_number' don't match", 28 ) ) )
+#endif
+            msg_Err( obj, "%s", msg ); break;
+        }
         case DVBPSI_MSG_WARN:  msg_Warn( obj, "%s", msg ); break;
         case DVBPSI_MSG_NONE:
         case DVBPSI_MSG_DEBUG: