summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-18 14:07:41 +0100
committerwm4 <wm4@nowhere>2013-11-18 14:21:01 +0100
commit03f93dc7a256d798d5f4bae6d94f530c30932c4b (patch)
treebf951722d31ca4f0771b0574f8189bc442a1f894
parentb1405f3cff1661d1ef6fd8103baed6da3c9eecff (diff)
downloadmpv-03f93dc7a256d798d5f4bae6d94f530c30932c4b.tar.bz2
mpv-03f93dc7a256d798d5f4bae6d94f530c30932c4b.tar.xz
stream_dvb: remove bogus free calls
The priv struct is now allocated by talloc in stream.c. It doesn't need to be manually freed, and using free() instead of talloc_free() probably crashes.
-rw-r--r--stream/stream_dvb.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 2114652ec5..b34e80b226 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -657,7 +657,6 @@ static int dvb_open(stream_t *stream, int mode)
priv->config = dvb_get_config();
if(priv->config == NULL)
{
- free(priv);
mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB CONFIGURATION IS EMPTY, exit\n");
return STREAM_ERROR;
}
@@ -674,7 +673,6 @@ static int dvb_open(stream_t *stream, int mode)
if(priv->card == -1)
{
- free(priv);
mp_msg(MSGT_DEMUX, MSGL_ERR, "NO CONFIGURATION FOUND FOR CARD N. %d, exit\n", p->cfg_card);
return STREAM_ERROR;
}
@@ -684,7 +682,6 @@ static int dvb_open(stream_t *stream, int mode)
if(tuner_type == 0)
{
- free(priv);
mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: UNKNOWN OR UNDETECTABLE TUNER TYPE, EXIT\n");
return STREAM_ERROR;
}
@@ -705,8 +702,6 @@ static int dvb_open(stream_t *stream, int mode)
if(! dvb_streaming_start(stream, tuner_type, progname))
{
- free(stream->priv);
- stream->priv = NULL;
return STREAM_ERROR;
}