From 8126f2a1b859e90e8553a94b602e9a733abb31b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20T=C3=B6rnblom?= <john.tornblom@gmail.com>
Date: Thu, 6 Sep 2012 12:09:00 +0200
Subject: [PATCH] Use pcr pid from streaming_start in case it changes during
 muxing

---
 src/muxer_pass.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/muxer_pass.c b/src/muxer_pass.c
index d7c8ca7e..e1eb20d3 100644
--- a/src/muxer_pass.c
+++ b/src/muxer_pass.c
@@ -53,7 +53,6 @@ typedef struct pass_muxer {
   uint8_t  *pm_pat;
   uint8_t  *pm_pmt;
   uint16_t pm_pmt_pid;
-  uint16_t pm_pcr_pid;
   uint32_t pm_ic; // Injection counter
   uint32_t pm_pc; // Packet counter
 } pass_muxer_t;
@@ -120,7 +119,7 @@ pass_muxer_init(muxer_t* m, const struct streaming_start *ss, const char *name)
     pm->pm_pmt[2] = 0x00 | (pm->pm_pmt_pid >> 0);
     pm->pm_pmt[3] = 0x10;
     pm->pm_pmt[4] = 0x00;
-    if(psi_build_pmt(ss, pm->pm_pmt+5, 183, pm->pm_pcr_pid) < 0) {
+    if(psi_build_pmt(ss, pm->pm_pmt+5, 183, ss->ss_pcr_pid) < 0) {
       pm->m_errors++;
       tvhlog(LOG_ERR, "pass", "%s: Unable to build pmt", pm->pm_filename);
       return -1;
@@ -324,7 +323,6 @@ pass_muxer_create(service_t *s, muxer_container_type_t mc)
   } else {
     pm->m_container = MC_MPEGTS;
     pm->pm_pmt_pid = s->s_pmt_pid;
-    pm->pm_pcr_pid = s->s_pcr_pid;
     pm->pm_pat = malloc(188);
     pm->pm_pmt = malloc(188);
     pm->pm_buf = malloc(188 * TS_BUFFER_COUNT);