[asterisk-commits] rmudgett: trunk r434383 - in /trunk: ./ main/format_cache.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Apr  8 11:31:45 2015
New Revision: 434383

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=434383
Log:
format_cache.c: Add missing slin12 format to ast_format_cache_is_slinear().
........

Merged revisions 434357 from http://svn.asterisk.org/svn/asterisk/branches/13

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

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

Modified: trunk/main/format_cache.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/format_cache.c?view=diff&rev=434383&r1=434382&r2=434383
==============================================================================
--- trunk/main/format_cache.c (original)
+++ trunk/main/format_cache.c Wed Apr  8 11:31:45 2015
@@ -500,6 +500,7 @@
 int ast_format_cache_is_slinear(struct ast_format *format)
 {
 	if ((ast_format_cmp(format, ast_format_slin) == AST_FORMAT_CMP_EQUAL)
+		|| (ast_format_cmp(format, ast_format_slin12) == AST_FORMAT_CMP_EQUAL)
 		|| (ast_format_cmp(format, ast_format_slin16) == AST_FORMAT_CMP_EQUAL)
 		|| (ast_format_cmp(format, ast_format_slin24) == AST_FORMAT_CMP_EQUAL)
 		|| (ast_format_cmp(format, ast_format_slin32) == AST_FORMAT_CMP_EQUAL)