diff options
Diffstat (limited to 'stream/stream_pvr.c')
| -rw-r--r-- | stream/stream_pvr.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c index 3271ce9742..4048168990 100644 --- a/stream/stream_pvr.c +++ b/stream/stream_pvr.c @@ -187,15 +187,9 @@ pvr_uninit (struct pvr_t *pvr) if (pvr->dev_fd) close (pvr->dev_fd); - if (pvr->video_dev) - free (pvr->video_dev); - - if (pvr->stationlist.list) - free (pvr->stationlist.list); - - if (pvr->param_channel) - free (pvr->param_channel); - + free (pvr->video_dev); + free (pvr->stationlist.list); + free (pvr->param_channel); free (pvr); } @@ -214,11 +208,8 @@ copycreate_stationlist (stationlist_t *stationlist, int num) num = FFMAX (num, chanlists[chantab].count); - if (stationlist->list) - { - free (stationlist->list); - stationlist->list = NULL; - } + free (stationlist->list); + stationlist->list = NULL; stationlist->total = 0; stationlist->enabled = 0; @@ -1150,8 +1141,7 @@ parse_v4l2_tv_options (struct pvr_t *pvr) if (stream_tv_defaults.device) { - if (pvr->video_dev) - free (pvr->video_dev); + free (pvr->video_dev); pvr->video_dev = strdup (stream_tv_defaults.device); } |