From a861ea34dd36354ee3540cca22077e4fdac4404e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 9 Jan 2012 13:23:29 +0100 Subject: [PATCH] ffdec: Correctly set the channel-mask and also set it for stereo --- ext/ffmpeg/gstffmpegcodecmap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index e4f5210be2..7483854958 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -168,11 +168,6 @@ gst_ff_channel_layout_to_gst (guint64 channel_layout, guint channels) GST_DEBUG ("mono common case; won't set channel positions"); g_free (pos); pos = NULL; - } else if (nchannels == 2 && pos[0] == GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT - && pos[1] == GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT) { - GST_DEBUG ("stereo common case; won't set channel positions"); - g_free (pos); - pos = NULL; } return pos; @@ -374,7 +369,7 @@ gst_ff_aud_caps_new (AVCodecContext * context, enum CodecID codec_id, guint64 mask; if (gst_audio_channel_positions_to_mask (pos, context->channels, &mask)) { - gst_caps_set_simple (caps, "channel-mask", GST_TYPE_BITMASK, &mask, + gst_caps_set_simple (caps, "channel-mask", GST_TYPE_BITMASK, mask, NULL); } g_free (pos);