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>
pull/62/merge
Clément Bœsch 8 years ago
commit 761bbb06ff
  1. 3
      libavdevice/bktr.c

@ -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