Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a'

* commit '81ef46020fa654720e3beb4f5551ba634fae262a':
  bktr: Use av_strerror and propagate error codes

Conflicts:
	libavdevice/bktr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavdevice/bktr.c
index 6c5a834,8042c38..c8a8953
--- 1/libavdevice/bktr.c
--- 2/libavdevice/bktr.c
+++ b/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)
      {