X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FMPEGDVBBundle%2FSNDUPacket.cc;fp=senf%2FPackets%2FMPEGDVBBundle%2FSNDUPacket.cc;h=6f4e8ea246cd6c5c1f3bf9be93747d9338fa161d;hb=4d90b955bf3590e215488395d1c9cec827476e07;hp=2aa625324b394ba778722e5db3c4b361e0da0747;hpb=9d13f0ba899d246a930acbe0d06ba00a962a2de6;p=senf.git

diff --git a/senf/Packets/MPEGDVBBundle/SNDUPacket.cc b/senf/Packets/MPEGDVBBundle/SNDUPacket.cc
index 2aa6253..6f4e8ea 100644
--- a/senf/Packets/MPEGDVBBundle/SNDUPacket.cc
+++ b/senf/Packets/MPEGDVBBundle/SNDUPacket.cc
@@ -57,12 +57,18 @@ prefix_ senf::PacketInterpreterBase::factory_t senf::SNDUPacketType::nextPacketT
 {
     if (p.data().size() < 8)
         return no_factory();
-    PkReg_Entry const * e;
-    if (p->type() < 1536)
-        e = PacketRegistry<senf::ULEExtHeaderTypes>::lookup( p->type(), nothrow );
-    else
-        e = PacketRegistry<senf::EtherTypes>::lookup( p->type(), nothrow );
-    return e ? e->factory() : no_factory();
+    senf::PacketInterpreterBase::factory_t f (no_factory());
+    if (p->type() < 1536) {
+        PacketRegistry<senf::ULEExtHeaderTypes>::Entry const * e (
+            PacketRegistry<senf::ULEExtHeaderTypes>::lookup( p->type(), nothrow ));
+        if (e) f = e->factory();
+    }
+    else {
+        PacketRegistry<senf::EtherTypes>::Entry const * e (
+            PacketRegistry<senf::ULEExtHeaderTypes>::lookup( p->type(), nothrow ));
+        if (e) f = e->factory();
+    }
+    return f;
 }
 
 prefix_ senf::PacketInterpreterBase::optional_range