oggmux: fix warning when we're not linked downstream and error out properly
Fix caps warning when there's no element linked downstream, and pass not-linked flow return value correctly up the chain, so we error out correctly. Fixes #588717.
This commit is contained in:
parent
f1e142ac9d
commit
16cad126f0
@ -499,7 +499,7 @@ gst_ogg_mux_push_buffer (GstOggMux * mux, GstBuffer * buffer)
|
||||
mux->last_ts = GST_BUFFER_TIMESTAMP (buffer);
|
||||
}
|
||||
|
||||
caps = gst_pad_get_negotiated_caps (mux->srcpad);
|
||||
caps = gst_static_pad_template_get_caps (&src_factory);
|
||||
gst_buffer_set_caps (buffer, caps);
|
||||
gst_caps_unref (caps);
|
||||
|
||||
@ -1169,8 +1169,8 @@ gst_ogg_mux_send_headers (GstOggMux * mux)
|
||||
static GstFlowReturn
|
||||
gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPad * best)
|
||||
{
|
||||
GstFlowReturn ret = GST_FLOW_OK;
|
||||
gboolean delta_unit;
|
||||
GstFlowReturn ret;
|
||||
gint64 granulepos = 0;
|
||||
GstClockTime timestamp, gp_time;
|
||||
|
||||
@ -1450,7 +1450,7 @@ gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPad * best)
|
||||
}
|
||||
}
|
||||
|
||||
return GST_FLOW_OK;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* all_pads_eos:
|
||||
|
Loading…
x
Reference in New Issue
Block a user