diff options
| author | Lukasz Marek <lukasz.m.luki2@gmail.com> | 2014-10-18 19:35:47 +0200 |
|---|---|---|
| committer | Lukasz Marek <lukasz.m.luki2@gmail.com> | 2014-10-21 22:57:32 +0200 |
| commit | da833a6d090f95f607f9c8cb00c2b55740d9120c (patch) | |
| tree | bf9d3ab10bcc1a4c1c2b876936f1ebaf0106ecdc | |
| parent | 3099008f07808dcf6edb2311fb1ee050444ffd1d (diff) | |
| download | ffmpeg-da833a6d090f95f607f9c8cb00c2b55740d9120c.tar.gz | |
lavd/fbdev_dec: use default device when not provided
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
| -rw-r--r-- | libavdevice/fbdev_dec.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavdevice/fbdev_dec.c b/libavdevice/fbdev_dec.c index 1593b102c7..7b13a8587d 100644 --- a/libavdevice/fbdev_dec.c +++ b/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; + const char* device; 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 ((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", - avctx->filename, av_err2str(ret)); + device, av_err2str(ret)); return ret; } |