/pidgin/main: 733b7e4daf48: Remove SPEEX specific codec preference

Mike Ruprecht cmaiku at gmail.com
Sat Jan 23 14:06:34 EST 2016


Changeset: 733b7e4daf489c3aefe150314714b11d9221b55a
Author:	 Mike Ruprecht <cmaiku at gmail.com>
Date:	 2016-01-22 02:57 -0600
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/733b7e4daf48

Description:

Remove SPEEX specific codec preference

Now that Farstream provides sane defaults, we no longer need to add
SPEEX specific codec preferences.

diffstat:

 libpurple/media/backend-fs2.c |  19 -------------------
 1 files changed, 0 insertions(+), 19 deletions(-)

diffs (29 lines):

diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -1714,25 +1714,6 @@ create_session(PurpleMediaBackendFs2 *se
 				GST_ELEMENT(priv->conference));
 	}
 
-	/*
-	 * Add SPEEX if the configuration file doesn't exist or
-	 * there isn't a speex entry.
-	 */
-	for (iter = codec_conf; iter; iter = g_list_next(iter)) {
-		FsCodec *codec = iter->data;
-		if (!g_ascii_strcasecmp(codec->encoding_name, "speex"))
-			break;
-	}
-
-	if (iter == NULL) {
-		codec_conf = g_list_prepend(codec_conf,
-				fs_codec_new(FS_CODEC_ID_ANY,
-				"SPEEX", FS_MEDIA_TYPE_AUDIO, 8000));
-		codec_conf = g_list_prepend(codec_conf,
-				fs_codec_new(FS_CODEC_ID_ANY,
-				"SPEEX", FS_MEDIA_TYPE_AUDIO, 16000));
-	}
-
 	fs_session_set_codec_preferences(session->session, codec_conf, NULL);
 	fs_codec_list_destroy(codec_conf);
 



More information about the Commits mailing list