diff options
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/bktr.c | 2 | ||||
| -rw-r--r-- | libavdevice/fbdev.c | 1 | ||||
| -rw-r--r-- | libavdevice/libdc1394.c | 2 | ||||
| -rw-r--r-- | libavdevice/v4l2.c | 6 | ||||
| -rw-r--r-- | libavdevice/vfwcap.c | 3 | ||||
| -rw-r--r-- | libavdevice/x11grab.c | 2 |
6 files changed, 1 insertions, 15 deletions
diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index f39a3c9957..f6216e0aa3 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -320,8 +320,6 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) last_frame_time = 0; out: - av_freep(&s->video_size); - av_freep(&s->framerate); return ret; } diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c index dadcd70015..d5ba561db8 100644 --- a/libavdevice/fbdev.c +++ b/libavdevice/fbdev.c @@ -103,7 +103,6 @@ av_cold static int fbdev_read_header(AVFormatContext *avctx, int ret, flags = O_RDONLY; ret = av_parse_video_rate(&fbdev->fps, fbdev->framerate); - av_freep(&fbdev->framerate); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Couldn't parse framerate.\n"); return ret; diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index f77a25748a..20170877dc 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -316,8 +316,6 @@ out_camera: dc1394_video_set_transmission(dc1394->camera, DC1394_OFF); dc1394_camera_free (dc1394->camera); out: - av_freep(&dc1394->video_size); - av_freep(&dc1394->pixel_format); dc1394_free(dc1394->d); return ret; } diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index d669f073b5..117f7cc534 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -663,10 +663,6 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) st->codec->bit_rate = s->frame_size * 1/av_q2d(st->codec->time_base) * 8; out: - av_freep(&s->video_size); - av_freep(&s->pixel_format); - av_freep(&s->standard); - av_freep(&s->framerate); return res; } @@ -714,7 +710,7 @@ static int v4l2_read_close(AVFormatContext *s1) #define DEC AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { - { "standard", "", OFFSET(standard), FF_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, + { "standard", "", OFFSET(standard), FF_OPT_TYPE_STRING, {.str = "NTSC" }, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, { "channel", "", OFFSET(channel), FF_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "pixel_format", "", OFFSET(pixel_format), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index 49fa078dd8..a8e67e7dda 100644 --- a/libavdevice/vfwcap.c +++ b/libavdevice/vfwcap.c @@ -232,9 +232,6 @@ static int vfw_read_close(AVFormatContext *s) pktl = next; } - av_freep(&ctx->video_size); - av_freep(&ctx->framerate); - return 0; } diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 87ace1e57a..09c121ee7a 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -259,8 +259,6 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) st->codec->bit_rate = x11grab->frame_size * 1/av_q2d(x11grab->time_base) * 8; out: - av_freep(&x11grab->video_size); - av_freep(&x11grab->framerate); return ret; } |