Merge branch 'tizen_3.0' into tizen 92/114592/1 accepted/tizen/common/20170214.173850 accepted/tizen/ivi/20170214.230148 accepted/tizen/mobile/20170214.230036 accepted/tizen/tv/20170214.230058 submit/tizen/20170214.113450
authorSeokHoon Lee <andy.shlee@samsung.com>
Tue, 14 Feb 2017 06:22:35 +0000 (15:22 +0900)
committerSeokHoon Lee <andy.shlee@samsung.com>
Tue, 14 Feb 2017 06:22:55 +0000 (15:22 +0900)
Conflicts:
packaging/libmm-wfd.spec
src/mm_wfd_sink_priv.c

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I2bc29adcc77634bc57a07dab96e9c2c37b603679

1  2 
src/mm_wfd_sink_priv.c

index fcb63ce899f91f44aa1905980fc4b72a6a0e68b5,0d87265c0a4b6778b53e8f4104f242b36ff28222..1f59ca09eda7671adf2dc5b1edae6b9cce01dd13
@@@ -2394,13 -2395,7 +2399,15 @@@ __mm_wfd_sink_demux_pad_added(GstElemen
                                                        wfd_sink->pipeline->mainbin &&
                                                        wfd_sink->pipeline->mainbin[WFD_SINK_M_PIPE].gst);
  
 +      wfd_sink_debug("Mux pad added, session mode = %d, name[0] = %c", wfd_sink->ini.sink_session_mode, name[0]);
 +      if(wfd_sink->ini.sink_session_mode == WFD_SESSION_MODE_AUDIO_ONLY && name[0] == 'v') {
 +              wfd_sink_error("Skip video pad add in audio only mode");
 +              // Do nothing
 +              goto done;
 +      }
 +
+       name = gst_pad_get_name(pad);
++
        pipeline = wfd_sink->pipeline->mainbin[WFD_SINK_M_PIPE].gst;
  
        /* take srcpad from demuxer added pad */