Merge 14abde389c
into f76dbffa6b
This commit is contained in:
commit
6b0435be15
|
@ -28,4 +28,5 @@ void GstElementDeleter::DeleteElementLater(GstElement* element) {
|
||||||
|
|
||||||
void GstElementDeleter::DeleteElement(GstElement* element) {
|
void GstElementDeleter::DeleteElement(GstElement* element) {
|
||||||
gst_element_set_state(element, GST_STATE_NULL);
|
gst_element_set_state(element, GST_STATE_NULL);
|
||||||
|
gst_object_unref(element);
|
||||||
}
|
}
|
||||||
|
|
|
@ -565,7 +565,7 @@ gboolean GstEnginePipeline::BusCallback(GstBus*, GstMessage* msg,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return FALSE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
GstBusSyncReply GstEnginePipeline::BusCallbackSync(GstBus*, GstMessage* msg,
|
GstBusSyncReply GstEnginePipeline::BusCallbackSync(GstBus*, GstMessage* msg,
|
||||||
|
@ -1098,6 +1098,7 @@ void GstEnginePipeline::SourceSetupCallback(GstURIDecodeBin* bin,
|
||||||
|
|
||||||
void GstEnginePipeline::TransitionToNext() {
|
void GstEnginePipeline::TransitionToNext() {
|
||||||
GstElement* old_decode_bin = uridecodebin_;
|
GstElement* old_decode_bin = uridecodebin_;
|
||||||
|
gst_object_ref(old_decode_bin);
|
||||||
|
|
||||||
ignore_tags_ = true;
|
ignore_tags_ = true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue