Browse Source

Merge commit '2f806622e1270d3ed1d41a53049a19673dafbe70'

* commit '2f806622e1270d3ed1d41a53049a19673dafbe70':
  bktr: Use memset(0) instead of zero initialization for struct sigaction

Merged-by: Clément Bœsch <u@pkh.me>
tags/n3.3
Clément Bœsch 9 years ago
parent
commit
761bbb06ff
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavdevice/bktr.c

+ 2
- 1
libavdevice/bktr.c View File

@@ -103,7 +103,7 @@ static av_cold int bktr_init(const char *video_device, int width, int height,
long ioctl_frequency;
char *arg;
int c;
struct sigaction act = { {0} }, old;
struct sigaction act, old;
int ret;
char errbuf[128];

@@ -134,6 +134,7 @@ static av_cold int bktr_init(const char *video_device, int width, int height,
frequency = 0.0;
}

memset(&act, 0, sizeof(act));
sigemptyset(&act.sa_mask);
act.sa_handler = catchsignal;
sigaction(SIGUSR1, &act, &old);


Loading…
Cancel
Save