diff options
| author | Marton Balint <cus@passwd.hu> | 2020-02-21 20:39:31 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2020-02-26 21:32:56 +0100 |
| commit | 95324ecf235a467f6804019e250e59bca576922a (patch) | |
| tree | 24275e7afe03223745d9d38c193e336f23a9b923 | |
| parent | 3e9793cf383054c0e8656996231d006d67bb3067 (diff) | |
| download | ffmpeg-95324ecf235a467f6804019e250e59bca576922a.tar.gz | |
avdevice/decklink_dec: fix stopping streams in read_close
The capture_started variable was never set, it is simpler to call the stop
functions unconditionally if the interface is available.
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | libavdevice/decklink_common.h | 1 | ||||
| -rw-r--r-- | libavdevice/decklink_dec.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index 8b3dbce2fb..27ce6a8a40 100644 --- a/libavdevice/decklink_common.h +++ b/libavdevice/decklink_common.h @@ -115,7 +115,6 @@ struct decklink_ctx { /* Status */ int playback_started; - int capture_started; int64_t last_pts; unsigned long frameCount; unsigned int dropped; diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 1fd5adf515..c8d931517e 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -983,7 +983,7 @@ av_cold int ff_decklink_read_close(AVFormatContext *avctx) struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; - if (ctx->capture_started) { + if (ctx->dli) { ctx->dli->StopStreams(); ctx->dli->DisableVideoInput(); ctx->dli->DisableAudioInput(); |