[svn-commits] mmichelson: branch 1.6.1 r140435 - in /branches/1.6.1: ./ main/file.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Aug 29 11:25:46 2008
New Revision: 140435

URL: http://svn.digium.com/view/asterisk?view=rev&rev=140435
Log:
Merged revisions 140433 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r140433 | mmichelson | 2008-08-29 11:24:37 -0500 (Fri, 29 Aug 2008) | 10 lines

Allow for video files to be opened as well as
audio files.

(closes issue #13372)
Reported by: epicac
Patches:
      13372.patch uploaded by putnopvut (license 60)
Tested by: epicac


........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/file.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/file.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/file.c?view=diff&rev=140435&r1=140434&r2=140435
==============================================================================
--- branches/1.6.1/main/file.c (original)
+++ branches/1.6.1/main/file.c Fri Aug 29 11:25:46 2008
@@ -379,7 +379,8 @@
 				struct ast_filestream *s;
 
 				if ( !(chan->writeformat & f->format) &&
-				     !(f->format & AST_FORMAT_AUDIO_MASK && fmt)) {
+				     !((f->format & AST_FORMAT_AUDIO_MASK && fmt) ||
+					  (f->format & AST_FORMAT_VIDEO_MASK && fmt))) {
 					ast_free(fn);
 					continue;	/* not a supported format */
 				}