diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 21:41:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 21:43:25 +0100 |
| commit | 265c4771cc764372104ba8f6abfdde9239f4c0ad (patch) | |
| tree | 19dddc4c7e16a5a314700c295a0793722679df2c /libavdevice | |
| parent | 9a534eda4608b76fa0c958e876025b2c639aeb63 (diff) | |
| parent | 043ea6f7bfc59399b6b3659da785ec4cc68a008e (diff) | |
| download | ffmpeg-streaming-265c4771cc764372104ba8f6abfdde9239f4c0ad.zip ffmpeg-streaming-265c4771cc764372104ba8f6abfdde9239f4c0ad.tar.gz | |
Merge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'
* commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e':
fbdev: Use av_strerror
Conflicts:
libavdevice/fbdev_dec.c
See: f6b56b1f26a1e40a47d85d24b42cd5475cd3b04f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/fbdev_dec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavdevice/fbdev_dec.c b/libavdevice/fbdev_dec.c index 7b13a85..e21a0ab 100644 --- a/libavdevice/fbdev_dec.c +++ b/libavdevice/fbdev_dec.c @@ -181,9 +181,10 @@ static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt) 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) { av_log(avctx, AV_LOG_WARNING, "Error refreshing variable info: %s\n", av_err2str(ret)); + } pkt->pts = curtime; |
