Commit 265c4771 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '043ea6f7'

* commit '043ea6f7':
  fbdev: Use av_strerror

Conflicts:
	libavdevice/fbdev_dec.c

See: f6b56b1fMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9a534eda 043ea6f7
...@@ -181,9 +181,10 @@ static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt) ...@@ -181,9 +181,10 @@ static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt)
return ret; return ret;
/* refresh fbdev->varinfo, visible data position may change at each call */ /* 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) {
av_log(avctx, AV_LOG_WARNING, av_log(avctx, AV_LOG_WARNING,
"Error refreshing variable info: %s\n", av_err2str(ret)); "Error refreshing variable info: %s\n", av_err2str(ret));
}
pkt->pts = curtime; pkt->pts = curtime;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment