else
s->alternate_sample_rate = s->core->alternate_sample_rate;
-<<<<<<< HEAD
- s->avoid_resampling = data->avoid_resampling;
-#ifdef __TIZEN__
- s->origin_avoid_resampling = data->avoid_resampling;
- s->selected_sample_format = s->sample_spec.format;
- s->selected_sample_rate = s->sample_spec.rate;
-#endif
-=======
if (data->avoid_resampling_is_set)
s->avoid_resampling = data->avoid_resampling;
else
s->avoid_resampling = s->core->avoid_resampling;
->>>>>>> upstream/15.0
+#ifdef __TIZEN__
+ s->selected_sample_format = s->sample_spec.format;
+ s->selected_sample_rate = s->sample_spec.rate;
+#endif
s->inputs = pa_idxset_new(NULL, NULL);
s->n_corked = 0;