diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-24 14:13:33 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-24 14:13:33 +0200 |
| commit | 0a1874461a21426826f3fe2e8655d7b6147b000f (patch) | |
| tree | 8ef1e70432e3f3c9b7540eb3fe75b678d7e947fb /gst/audioconvert | |
| parent | 1bb83435fda91a4612b383194f56ef24c4c0b299 (diff) | |
| download | gstreamer-plugins-base-0a1874461a21426826f3fe2e8655d7b6147b000f.tar.gz | |
audio: rename UNPOSITIONED to DEFAULT_POSITIONS
Rename the UNPOSITIONED flag to the DEFAULT_POSITIONS flag because that is
really what the resulting GstAudioInfo will contain as the chanel mappings.
Diffstat (limited to 'gst/audioconvert')
| -rw-r--r-- | gst/audioconvert/audioconvert.c | 3 | ||||
| -rw-r--r-- | gst/audioconvert/gstchannelmix.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/gst/audioconvert/audioconvert.c b/gst/audioconvert/audioconvert.c index 69829a15a..509a85a66 100644 --- a/gst/audioconvert/audioconvert.c +++ b/gst/audioconvert/audioconvert.c @@ -608,9 +608,6 @@ audio_convert_prepare_context (AudioConvertCtx * ctx, GstAudioInfo * in, /* first clean the existing context */ audio_convert_clean_context (ctx); - g_return_val_if_fail (GST_AUDIO_INFO_IS_UNPOSITIONED (in) == - GST_AUDIO_INFO_IS_UNPOSITIONED (out), FALSE); - ctx->in = *in; ctx->out = *out; diff --git a/gst/audioconvert/gstchannelmix.c b/gst/audioconvert/gstchannelmix.c index f4b350ade..a68f2c1ac 100644 --- a/gst/audioconvert/gstchannelmix.c +++ b/gst/audioconvert/gstchannelmix.c @@ -584,7 +584,7 @@ gst_channel_mix_fill_matrix (AudioConvertCtx * this) gst_channel_mix_fill_identical (this); - if (!GST_AUDIO_INFO_IS_UNPOSITIONED (&this->in)) { + if (!GST_AUDIO_INFO_HAS_DEFAULT_POSITIONS (&this->in)) { gst_channel_mix_fill_compatible (this); gst_channel_mix_fill_others (this); gst_channel_mix_fill_normalize (this); |