comparison mpegts.c @ 2128:42fe0d356a7d libavformat

make new_service() update existing info sanely

2127:e70e06400158

}

static MpegTSService *new_service(MpegTSContext *ts, int sid,
                                  char *provider_name, char *name)
{
    MpegTSService *service;

#ifdef DEBUG_SI
    av_log(ts->stream, AV_LOG_DEBUG, "new_service: "
           "sid=0x%04x provider='%s' name='%s'\n",
           sid, provider_name, name);
#endif

    service = av_mallocz(sizeof(MpegTSService));
    if (!service)
        return NULL;
    service->sid = sid;
    service->provider_name = provider_name;
    service->name = name;
    dynarray_add(&ts->services, &ts->nb_services, service);
    return service;
}

static void pmt_cb(void *opaque, const uint8_t *section, int section_len)
{

2128:42fe0d356a7d

}

static MpegTSService *new_service(MpegTSContext *ts, int sid,
                                  char *provider_name, char *name)
{
    MpegTSService *service=NULL;
    int i;

#ifdef DEBUG_SI
    av_log(ts->stream, AV_LOG_DEBUG, "new_service: "
           "sid=0x%04x provider='%s' name='%s'\n",
           sid, provider_name, name);
#endif

    for(i=0; i<ts->nb_services; i++)
        if(ts->services[i]->sid == sid)
            service= ts->services[i];

    if(!service){
        service = av_mallocz(sizeof(MpegTSService));
        if (!service)
            return NULL;
        dynarray_add(&ts->services, &ts->nb_services, service);
    }
    service->sid = sid;
    assert((!provider_name) == (!name));
    if(name){
        av_free(service->provider_name);
        av_free(service->         name);
        service->provider_name = provider_name;
        service->         name =          name;
    }
    return service;
}

static void pmt_cb(void *opaque, const uint8_t *section, int section_len)
{