stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix the unitialized variable for the cache scheme (HTTP streaming)

Browse source
This commit is contained in:
Jaroslav Kysela 2014-03-15 18:56:48 +01:00
parent ed45ab7224
commit 2d138b9b7e
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/muxer.c
View file

@ -251,11 +251,12 @@ muxer_create(muxer_container_type_t mc, muxer_config_t *m_cfg)
m = lav_muxer_create(mc, m_cfg);
#endif
if(!m)
if(!m) {
tvhlog(LOG_ERR, "mux", "Can't find a muxer that supports '%s' container",
muxer_container_type2txt(mc));
else
m->m_cache = m_cfg->dvr_cache;
return NULL;
}
m->m_cache = m_cfg ? m_cfg->dvr_cache : MC_CACHE_SYSTEM;
return m;
}

1
src/webui/webui.c
View file

@ -787,6 +787,7 @@ http_stream_channel(http_connection_t *hc, channel_t *ch, int weight)
mc = cfg->dvr_mc;
}
m_cfg.dvr_flags = cfg->dvr_mux_flags;
m_cfg.dvr_cache = cfg->dvr_mux_cache;
if ((str = http_arg_get(&hc->hc_req_args, "qsize")))
qsize = atoll(str);