[libdvbpsi-devel] Extra network_id and initial_service_id can both occur simultaneously

[Daniel Kamil Kozar]

libdvbpsi | branch: master | Daniel Kamil Kozar <dkk089 at gmail.com> | Sat Jul 18 22:02:53 2015 +0200| [73d5d3a20cd54f580072547e2b2175c4a6e04633] | committer: Jean-Paul Saman

Extra network_id and initial_service_id can both occur simultaneously

(cherry picked from commit 25669604c1e16f945f7f6d896bf9d7b97e19f03c)
Signed-off-by: Jean-Paul Saman <jpsaman at videolan.org>

> http://git.videolan.org/gitweb.cgi/libdvbpsi.git/?a=commit;h=73d5d3a20cd54f580072547e2b2175c4a6e04633
---

 src/descriptors/dr_4a.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/descriptors/dr_4a.c b/src/descriptors/dr_4a.c
index f00e646..c992195 100644
--- a/src/descriptors/dr_4a.c
+++ b/src/descriptors/dr_4a.c
@@ -152,13 +152,13 @@ dvbpsi_descriptor_t * dvbpsi_GenLinkageDr(dvbpsi_linkage_dr_t * p_decoded,
     if (p_decoded->i_linkage_type == 0x08)
     {
         length++;
+
         if ((p_decoded->i_handover_type > 0) &&
             (p_decoded->i_handover_type < 3))
-        {
             length+=2;
-	    if (p_decoded->i_origin_type == 0)
-                length+=2;
-	}
+
+        if (p_decoded->i_origin_type == 0)
+            length+=2;
     }
     if (p_decoded->i_linkage_type == 0x0D)
         length+=3;