[svn-commits] file: trunk r42601 - in /trunk: ./ main/channel.c

[svn-commits at lists.digium.com]

Author: file
Date: Sat Sep  9 15:25:45 2006
New Revision: 42601

URL: http://svn.digium.com/view/asterisk?rev=3D42601&view=3Drev
Log:
Merged revisions 42600 via svnmerge from =

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r42600 | file | 2006-09-09 16:24:19 -0400 (Sat, 09 Sep 2006) | 2 lines

Only truly consider the channel in the same format if the format matches th=
e raw format OR if a translation path already exists to translate between t=
hem. (issue #7887 reported by softins & issue #7803 reported by alvaro_palm=
a_aste). Thanks goes to stubert for giving me access to a box and showing m=
e a scenario where this occured.

........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
---------------------------------------------------------------------------=
---
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?rev=3D42601&r=
1=3D42600&r2=3D42601&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Sat Sep  9 15:25:45 2006
@@ -2614,7 +2614,7 @@
 	/* Now we have a good choice for both. */
 	ast_channel_lock(chan);
 =

-	if ((*rawformat =3D=3D native) && (*format =3D=3D fmt)) {
+	if ((*rawformat =3D=3D native) && (*format =3D=3D fmt) && ((*rawformat =
=3D=3D *format) || (*trans))) {
 		/* the channel is already in these formats, so nothing to do */
 		ast_channel_unlock(chan);
 		return 0;