diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2015-08-18 16:28:42 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2015-08-18 16:28:42 +0300 |
commit | 64301f10050d05e31d872cd08bf4a906d4cd76e1 (patch) | |
tree | c695cc3d20505ae8efafcb381adb3c7bf62aa18d | |
parent | 6cda5d34946848533b9ef43acd0b35167de98941 (diff) |
video(en|de)coder: Return TRUE when we consumed a tag event without creating a new event
Fixes spurious flow errors that especially break gst-validate.
-rw-r--r-- | gst-libs/gst/video/gstvideodecoder.c | 2 | ||||
-rw-r--r-- | gst-libs/gst/video/gstvideoencoder.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c index 79569f006..f8a586954 100644 --- a/gst-libs/gst/video/gstvideodecoder.c +++ b/gst-libs/gst/video/gstvideodecoder.c @@ -1425,6 +1425,8 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder, gst_event_unref (event); event = gst_video_decoder_create_merged_tags_event (decoder); GST_VIDEO_DECODER_STREAM_UNLOCK (decoder); + if (!event) + ret = TRUE; } break; } diff --git a/gst-libs/gst/video/gstvideoencoder.c b/gst-libs/gst/video/gstvideoencoder.c index 8b52b1abe..c45bc7d38 100644 --- a/gst-libs/gst/video/gstvideoencoder.c +++ b/gst-libs/gst/video/gstvideoencoder.c @@ -1118,6 +1118,8 @@ gst_video_encoder_sink_event_default (GstVideoEncoder * encoder, gst_event_unref (event); event = gst_video_encoder_create_merged_tags_event (encoder); GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder); + if (!event) + ret = TRUE; } break; } |