| Message ID | 20200222182948.5538-1-cus@passwd.hu |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avdevice/decklink_dec: fix stopping streams in read_close | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make finished |
On Sat, 22 Feb 2020, Marton Balint wrote: > The capture_started variable was never set, it is simpler to call the stop > functions unconditionally if the interface is available. Applied the series. Regards, Marton > > Signed-off-by: Marton Balint <cus@passwd.hu> > --- > libavdevice/decklink_common.h | 1 - > libavdevice/decklink_dec.cpp | 2 +- > 2 files changed, 1 insertion(+), 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(); > -- > 2.16.4 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
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();
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> --- libavdevice/decklink_common.h | 1 - libavdevice/decklink_dec.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)