Commit de569725 authored by Romain Perier's avatar Romain Perier
Browse files

Merge branch 'master' into subsapi

parents b25d2f7c 073bd62b
......@@ -67,7 +67,7 @@ AudioDataOutput::AudioDataOutput(Backend *backend, QObject *parent)
gst_bin_add_many(GST_BIN(m_queue), sink, convert, queue, NULL);
gst_element_link(queue, convert);
gst_element_link_filtered(convert, sink, caps);
gst_object_unref(caps);
gst_caps_unref(caps);
GstPad *inputpad = gst_element_get_static_pad(queue, "sink");
gst_element_add_pad(m_queue, gst_ghost_pad_new("sink", inputpad));
......
......@@ -104,7 +104,7 @@ Comment[ro]=Suportul GStreamer pentru Phonon
Comment[ru]=Механизм GStreamer для Phonon
Comment[se]=Phonon GStreamer duogášmohtor
Comment[sk]=GStreamer podsystém
Comment[sl]=Phononova hrbtenica GStreamer
Comment[sl]=Zaledje GStreamer za Phonon
Comment[sr]=Гстример као позадина Фонона
Comment[sr@ijekavian]=Гстример као позадина Фонона
Comment[sr@ijekavianlatin]=GStreamer kao pozadina Phonona
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment