Re: [FFmpeg-devel] [PATCH] lavd/fbdev_dec: use default device when not provided

2014-10-21 Thread Lukasz Marek 

On 19.10.2014 00:27, Michael Niedermayer wrote:

On Sat, Oct 18, 2014 at 07:38:16PM +0200, Lukasz Marek wrote:

Signed-off-by: Lukasz Marek 
---
  libavdevice/fbdev_dec.c | 10 --
  1 file changed, 8 insertions(+), 2 deletions(-)


LGTM


Pushed.

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] lavd/fbdev_dec: use default device when not provided

2014-10-18 Thread Michael Niedermayer 
On Sat, Oct 18, 2014 at 07:38:16PM +0200, Lukasz Marek wrote:
> Signed-off-by: Lukasz Marek 
> ---
>  libavdevice/fbdev_dec.c | 10 --
>  1 file changed, 8 insertions(+), 2 deletions(-)

LGTM

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The real ebay dictionary, page 1
"Used only once"- "Some unspecified defect prevented a second use"
"In good condition" - "Can be repaird by experienced expert"
"As is" - "You wouldnt want it even if you were payed for it, if you knew ..."


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] lavd/fbdev_dec: use default device when not provided

2014-10-18 Thread Lukasz Marek 
Signed-off-by: Lukasz Marek 
---
 libavdevice/fbdev_dec.c | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libavdevice/fbdev_dec.c b/libavdevice/fbdev_dec.c
index 1593b10..7b13a85 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;
 }
 
-- 
1.9.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel