From 09efbe103fa743742d55e9ad13bed6142bb8d684 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 10 Jan 2012 10:08:05 +0100 Subject: [PATCH] ffmpeg: Channel layouts are now set for DTS and (E)AC3 by libav --- ext/ffmpeg/gstffmpegcodecmap.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 0f6fe9e..2be5892 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -328,26 +328,6 @@ gst_ff_aud_caps_new (AVCodecContext * context, enum CodecID codec_id, gst_audio_info_init (&info); - - if (channel_layout == 0) { - const guint64 default_channel_set[] = { - 0, 0, CH_LAYOUT_SURROUND, CH_LAYOUT_QUAD, CH_LAYOUT_5POINT0, - CH_LAYOUT_5POINT1, 0, CH_LAYOUT_7POINT1 - }; - - switch (codec_id) { - case CODEC_ID_EAC3: - case CODEC_ID_AC3: - case CODEC_ID_DTS: - if (context->channels > 0 - && context->channels < G_N_ELEMENTS (default_channel_set)) - channel_layout = default_channel_set[context->channels - 1]; - break; - default: - break; - } - } - caps = gst_caps_new_simple (mimetype, "rate", G_TYPE_INT, context->sample_rate, "channels", G_TYPE_INT, context->channels, NULL); -- 2.7.4