Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavd/xv: report if no adaptor present.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/50/merge
Michael Niedermayer 11 years ago
commit 9ed640015b
  1. 4
      libavdevice/xv.c

@ -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);

Loading…
Cancel
Save