diff options
author | Dmitry Osipenko <digetx@gmail.com> | 2018-03-10 19:38:07 +0300 |
---|---|---|
committer | Dmitry Osipenko <digetx@gmail.com> | 2018-03-10 19:43:21 +0300 |
commit | 0c8b366716699ae527d75bbb9ac6e11463cfb067 (patch) | |
tree | e924132a6a87949b73ee089dbcb391a0d6f7b0d0 | |
parent | cdc33cfe18493107ead543226e6690d65dcf8c36 (diff) |
Don't fail if 2d channel fails to open
This allows to at least display video in Xv overlay if 2d channel opening fails.
-rw-r--r-- | src/tegra_stream.c | 4 | ||||
-rw-r--r-- | src/vdpau_tegra.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/tegra_stream.c b/src/tegra_stream.c index a1c8aac..a623fa3 100644 --- a/src/tegra_stream.c +++ b/src/tegra_stream.c @@ -136,6 +136,10 @@ int tegra_stream_begin(struct tegra_stream *stream) { int ret; + if (!stream->channel) { + return -1; + } + /* check stream and its state */ if (!(stream && stream->status == TEGRADRM_STREAM_FREE)) { ErrorMsg("Stream status isn't FREE\n"); diff --git a/src/vdpau_tegra.c b/src/vdpau_tegra.c index cbe60df..558a3e2 100644 --- a/src/vdpau_tegra.c +++ b/src/vdpau_tegra.c @@ -675,7 +675,6 @@ EXPORTED VdpStatus vdp_imp_device_create_x11(Display *display, ret = drm_tegra_channel_open(&gr2d, drm, DRM_TEGRA_GR2D); if (ret < 0) { ErrorMsg("failed to open 2D channel: %d\n", ret); - goto err_cleanup; } stream = calloc(1, sizeof(*stream)); |