Commit 9ed64001 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavd/xv: report if no adaptor present.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 12fc0c89 fde219cf
...@@ -149,6 +149,10 @@ static int xv_write_header(AVFormatContext *s) ...@@ -149,6 +149,10 @@ static int xv_write_header(AVFormatContext *s)
ret = AVERROR_EXTERNAL; ret = AVERROR_EXTERNAL;
goto fail; 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; xv->xv_port = ai[0].base_id;
XvFreeAdaptorInfo(ai); XvFreeAdaptorInfo(ai);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment