repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavdevice
/
fbdev_dec.c
diff --git
a/ffmpeg/libavdevice/fbdev_dec.c
b/ffmpeg/libavdevice/fbdev_dec.c
index 1593b102c7e8f2ba26ef10fd96417eb7cadc6037..f56408c3d454371027f493e9039a64b30b90daaa 100644
(file)
--- a/
ffmpeg/libavdevice/fbdev_dec.c
+++ b/
ffmpeg/libavdevice/fbdev_dec.c
@@
-68,6
+68,7
@@
static av_cold int fbdev_read_header(AVFormatContext *avctx)
AVStream *st = NULL;
enum AVPixelFormat pix_fmt;
int ret, flags = O_RDONLY;
AVStream *st = NULL;
enum AVPixelFormat pix_fmt;
int ret, flags = O_RDONLY;
+ const char* device;
if (!(st = avformat_new_stream(avctx, NULL)))
return AVERROR(ENOMEM);
if (!(st = avformat_new_stream(avctx, NULL)))
return AVERROR(ENOMEM);
@@
-77,11
+78,16
@@
static av_cold int fbdev_read_header(AVFormatContext *avctx)
if (avctx->flags & AVFMT_FLAG_NONBLOCK)
flags |= O_NONBLOCK;
if (avctx->flags & AVFMT_FLAG_NONBLOCK)
flags |= O_NONBLOCK;
- if ((fbdev->fd = avpriv_open(avctx->filename, flags)) == -1) {
+ if (avctx->filename[0])
+ device = avctx->filename;
+ else
+ device = ff_fbdev_default_device();
+
+ if ((fbdev->fd = avpriv_open(device, flags)) == -1) {
ret = AVERROR(errno);
av_log(avctx, AV_LOG_ERROR,
"Could not open framebuffer device '%s': %s\n",
ret = AVERROR(errno);
av_log(avctx, AV_LOG_ERROR,
"Could not open framebuffer device '%s': %s\n",
-
avctx->filenam
e, av_err2str(ret));
+
devic
e, av_err2str(ret));
return ret;
}
return ret;
}
@@
-175,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 */
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,
av_log(avctx, AV_LOG_WARNING,
- "Error refreshing variable info: %s\n", av_err2str(ret));
+ "Error refreshing variable info: %s\n", av_err2str(AVERROR(errno)));
+ }
pkt->pts = curtime;
pkt->pts = curtime;