* demux.c: On new PMTs, delete the CAPMT before changing ES selection.

demux.c

@@ -1198,6 +1198,10 @@ static void PMTCallback( void *_unused, dvbpsi_pmt_t *p_pmt )
         return;
     }
 
+    if ( i_ca_handle && b_is_selected &&
+         !b_needs_descrambling && b_needed_descrambling )
+        en50221_DeletePMT( p_current_pmt );
+
     msg_Dbg( NULL, "new PMT program number=%d version=%d pid_pcr=%d",
              p_pmt->i_program_number, p_pmt->i_version, p_pmt->i_pcr_pid );
 
@@ -1241,10 +1245,6 @@ static void PMTCallback( void *_unused, dvbpsi_pmt_t *p_pmt )
             }
         }
 
-        if ( i_ca_handle && b_is_selected &&
-             !b_needs_descrambling && b_needed_descrambling )
-            en50221_DeletePMT( p_current_pmt );
-
         dvbpsi_DeletePMT( p_current_pmt );
     }