return NULL;
service->pmt.pid = ts->pmt_start_pid + ts->nb_services;
service->sid = sid;
+ service->pcr_pid = 0x1fff;
service->provider_name = av_strdup(provider_name);
service->name = av_strdup(name);
- service->pcr_pid = 0x1fff;
+ if (!service->provider_name || !service->name) {
+ free(service->provider_name);
+ free(service->name);
+ free(service);
+ return NULL;
+ }
dynarray_add(&ts->services, &ts->nb_services, service);
return service;
}
service = mpegts_add_service(ts, ts->service_id,
provider_name, service_name);
+ if (!service)
+ return AVERROR(ENOMEM);
+
service->pmt.write_packet = section_write_packet;
service->pmt.opaque = s;
service->pmt.cc = 15;
ts->sdt.opaque = s;
pids = av_malloc(s->nb_streams * sizeof(*pids));
- if (!pids)
+ if (!pids) {
+ av_free(service);
return AVERROR(ENOMEM);
+ }
/* assign pids to each stream */
for (i = 0; i < s->nb_streams; i++) {
ret = AVERROR(EINVAL);
goto fail;
}
- ast = avformat_new_stream(ts_st->amux, NULL);
+ if (!(ast = avformat_new_stream(ts_st->amux, NULL))) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
ret = avcodec_copy_context(ast->codec, st->codec);
if (ret != 0)
goto fail;
return 0;
fail:
+ av_free(service);
av_free(pids);
for (i = 0; i < s->nb_streams; i++) {
st = s->streams[i];