[FFmpeg-cvslog] lavd/v4l2: reduce variable scope
Anton Khirnov
git at videolan.org
Tue Dec 7 12:18:15 EET 2021
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Nov 25 15:58:14 2021 +0100| [b532ca3d2f1f1caab71c0aab979949882b695198] | committer: Anton Khirnov
lavd/v4l2: reduce variable scope
device and cap are local to the loop iteration, there is no need for
them to retain their values. Especially for device it may be dangerous,
since it points to av_malloc'ed data.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b532ca3d2f1f1caab71c0aab979949882b695198
---
libavdevice/v4l2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 4b7984f1b0..fefea54142 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -1019,8 +1019,6 @@ static int v4l2_get_device_list(AVFormatContext *ctx, AVDeviceInfoList *device_l
struct video_data *s = ctx->priv_data;
DIR *dir;
struct dirent *entry;
- AVDeviceInfo *device = NULL;
- struct v4l2_capability cap;
int ret = 0;
if (!device_list)
@@ -1033,6 +1031,8 @@ static int v4l2_get_device_list(AVFormatContext *ctx, AVDeviceInfoList *device_l
return ret;
}
while ((entry = readdir(dir))) {
+ AVDeviceInfo *device = NULL;
+ struct v4l2_capability cap;
int fd = -1;
char device_name[256];
More information about the ffmpeg-cvslog
mailing list