Changeset 1657


Ignore:
Timestamp:
02/23/10 09:43:38 (11 years ago)
Author:
_network
Message:

module-dvbapi: fix crash on mips architecture

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/module-dvbapi.c

    r1621 r1657  
    5757    unsigned char lastcw0[8];
    5858    unsigned char lastcw1[8];
    59     pthread_t descramble_thread;
    60     unsigned int thread_active;
    6159} DEMUXTYPE;
    6260#define DMX_FILTER_SIZE 16
     
    425423        close(demux[demux_id].demux_emm_fd);
    426424        demux[demux_id].demux_emm_fd=0;
    427     }
    428 
    429     if (demux[demux_id].thread_active == 0) {
    430         pthread_cancel(demux[demux_id].descramble_thread);
    431         pthread_join(demux[demux_id].descramble_thread, NULL);
    432         demux[demux_id].thread_active = -1;
    433425    }
    434426
     
    879871    if (demux[demux_id].ECMpidcount>0) {
    880872        dvbapi_resort_ecmpids(demux_id);
    881         if (demux[demux_id].ECMpidcount>0) {}
    882             demux[demux_id].thread_active=pthread_create(&demux[demux_id].descramble_thread, NULL, thread_descrambling, (void*)demux_id);
     873        if (demux[demux_id].ECMpidcount>0) {
     874            pthread_t p3;
     875            if (pthread_create(&p3, NULL, thread_descrambling, (void*)demux_id))
     876                cs_log("dvbapi: pthread error");
     877        }
    883878    }
    884879
     
    10471042        demux[i].ca_fd=0;
    10481043        demux[i].demux_index=-1;
    1049         demux[i].thread_active = -1;
    10501044        memset(demux[i].buffer_cache_dmx,0 ,12);
    10511045    }
Note: See TracChangeset for help on using the changeset viewer.