[FFmpeg-cvslog] Merge commit '2f806622e1270d3ed1d41a53049a19673dafbe70'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Fri Mar 24 12:40:51 2017 +0100| [761bbb06ff591343b3e1ec141bb23cb2dfe502d0] | committer: Clément Bœsch

Merge commit '2f806622e1270d3ed1d41a53049a19673dafbe70'

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

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=761bbb06ff591343b3e1ec141bb23cb2dfe502d0
---

 libavdevice/bktr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c
index 2902425..418247d 100644
--- a/libavdevice/bktr.c
+++ b/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);


======================================================================