har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavd/fbdev_dec: use default device when not provided

Browse Source 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
This commit is contained in:
Lukasz Marek 2014-10-18 19:35:47 +02:00
parent 3099008f07
commit da833a6d09
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavdevice/fbdev_dec.c
View File

@ -68,6 +68,7 @@ static av_cold int fbdev_read_header(AVFormatContext *avctx)
AVStream *st = NULL; AVStream *st = NULL;
enum AVPixelFormat pix_fmt; enum AVPixelFormat pix_fmt;
int ret, flags = O_RDONLY; int ret, flags = O_RDONLY;
const char* device;
if (!(st = avformat_new_stream(avctx, NULL))) if (!(st = avformat_new_stream(avctx, NULL)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -77,11 +78,16 @@ static av_cold int fbdev_read_header(AVFormatContext *avctx)
if (avctx->flags & AVFMT_FLAG_NONBLOCK) if (avctx->flags & AVFMT_FLAG_NONBLOCK)
flags |= O_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); ret = AVERROR(errno);
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Could not open framebuffer device '%s': %s\n", "Could not open framebuffer device '%s': %s\n",
avctx->filename, av_err2str(ret)); device, av_err2str(ret));
return ret; return ret;
} }