diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-29 21:11:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-29 21:11:29 +0100 |
| commit | 9ed640015bf321b20b1e8ab8767be5b4ebcc3d0d (patch) | |
| tree | 9db80a93d3424e01b7e74bd3685ba85c2cafa5f0 | |
| parent | 12fc0c89dc6b4f092b14f297f29dfd73fe31fecf (diff) | |
| parent | fde219cfa8f6e823c770d57b2fa2a2799a5445e2 (diff) | |
| download | ffmpeg-9ed640015bf321b20b1e8ab8767be5b4ebcc3d0d.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavd/xv: report if no adaptor present.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavdevice/xv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavdevice/xv.c b/libavdevice/xv.c index ad604825f2..a4b44c8eda 100644 --- a/libavdevice/xv.c +++ b/libavdevice/xv.c @@ -149,6 +149,10 @@ static int xv_write_header(AVFormatContext *s) ret = AVERROR_EXTERNAL; goto fail; } + if (!num_adaptors) { + av_log(s, AV_LOG_ERROR, "No X-Video adaptors present\n"); + return AVERROR(ENODEV); + } xv->xv_port = ai[0].base_id; XvFreeAdaptorInfo(ai); |