summaryrefslogtreecommitdiff
path: root/sys/applemedia
diff options
context:
space:
mode:
Diffstat (limited to 'sys/applemedia')
-rw-r--r--sys/applemedia/vtdec.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/applemedia/vtdec.c b/sys/applemedia/vtdec.c
index fc81774ac..472e39eb4 100644
--- a/sys/applemedia/vtdec.c
+++ b/sys/applemedia/vtdec.c
@@ -808,7 +808,14 @@ gst_vtdec_push_frames_if_needed (GstVtdec * vtdec, gboolean drain,
/* negotiate now so that we know whether we need to use the GL upload meta or
* not */
if (gst_pad_check_reconfigure (decoder->srcpad)) {
- gst_video_decoder_negotiate (decoder);
+ if (!gst_video_decoder_negotiate (decoder)) {
+ gst_pad_mark_reconfigure (decoder->srcpad);
+ if (GST_PAD_IS_FLUSHING (decoder->srcpad))
+ ret = GST_FLOW_FLUSHING;
+ else
+ ret = GST_FLOW_NOT_NEGOTIATED;
+ return ret;
+ }
}
if (drain)