Merge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Oct 2014 20:41:59 +0000 (21:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Oct 2014 20:43:25 +0000 (21:43 +0100)
* commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e':
  fbdev: Use av_strerror

Conflicts:
libavdevice/fbdev_dec.c

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

@@@ -181,9 -216,12 +181,10 @@@ static int fbdev_read_packet(AVFormatCo
          return ret;
  
      /* refresh fbdev->varinfo, visible data position may change at each call */
-     if (ioctl(fbdev->fd, FBIOGET_VSCREENINFO, &fbdev->varinfo) < 0)
+     if (ioctl(fbdev->fd, FBIOGET_VSCREENINFO, &fbdev->varinfo) < 0) {
 -        char errbuf[128];
 -        av_strerror(AVERROR(errno), errbuf, sizeof(errbuf));
          av_log(avctx, AV_LOG_WARNING,
 -               "Error refreshing variable info: %s\n", errbuf);
 +               "Error refreshing variable info: %s\n", av_err2str(ret));
+     }
  
      pkt->pts = curtime;