decodebin: Don't add a children to a decode group twice
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 30 Mar 2013 09:25:45 +0000 (10:25 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 30 Mar 2013 10:49:42 +0000 (11:49 +0100)
This can happen if a demuxer does not provide fixed caps from the
beginning but only sets them later.

gst/playback/gstdecodebin2.c
win32/common/libgstvideo.def

index e697504..672c168 100644 (file)
@@ -1433,7 +1433,7 @@ analyze_new_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad,
      * start a new chain for it */
     CHAIN_MUTEX_LOCK (oldchain);
     group = gst_decode_chain_get_current_group (chain);
-    if (group) {
+    if (group && !g_list_find (group->children, chain)) {
       chain = gst_decode_chain_new (dbin, group, pad);
       group->children = g_list_prepend (group->children, chain);
     }
index 3a9f630..e0008ee 100644 (file)
@@ -1,5 +1,6 @@
 EXPORTS
        _gst_video_decoder_error
+       gst_buffer_add_video_gl_texture_upload_meta
        gst_buffer_add_video_meta
        gst_buffer_add_video_meta_full
        gst_buffer_add_video_overlay_composition_meta
@@ -137,6 +138,9 @@ EXPORTS
        gst_video_frame_map
        gst_video_frame_map_id
        gst_video_frame_unmap
+       gst_video_gl_texture_upload_meta_api_get_type
+       gst_video_gl_texture_upload_meta_get_info
+       gst_video_gl_texture_upload_meta_upload
        gst_video_info_align
        gst_video_info_convert
        gst_video_info_from_caps