Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 01:56:17 +0000 (02:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 01:56:17 +0000 (02:56 +0100)
* commit '81ef46020fa654720e3beb4f5551ba634fae262a':
  bktr: Use av_strerror and propagate error codes

Conflicts:
libavdevice/bktr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavdevice/bktr.c

@@@ -103,7 -104,9 +103,9 @@@ static av_cold int bktr_init(const cha
      long ioctl_frequency;
      char *arg;
      int c;
 -    struct sigaction act = { 0 }, old;
 +    struct sigaction act = { {0} }, old;
+     int ret;
+     char errbuf[128];
  
      if (idev < 0 || idev > 4)
      {