[asterisk-commits] lmadsen: branch 1.8 r321335 - in /branches/1.8: include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Fri May 27 16:54:54 2011
New Revision: 321335

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321335
Log:
Fix issue with playback of H.261 video.

(closes issue #19379)
Reported by: neutrino88
Patches:
      videoprompt.patch uploaded by neutrino88 (license 297)
(changes by russell)

Modified:
    branches/1.8/include/asterisk/frame.h
    branches/1.8/main/file.c

Modified: branches/1.8/include/asterisk/frame.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/include/asterisk/frame.h?view=diff&rev=321335&r1=321334&r2=321335
==============================================================================
--- branches/1.8/include/asterisk/frame.h (original)
+++ branches/1.8/include/asterisk/frame.h Fri May 27 16:54:54 2011
@@ -278,6 +278,7 @@
 #define AST_FORMAT_PNG        (1ULL << 17)
 /*! H.261 Video */
 #define AST_FORMAT_H261       (1ULL << 18)
+#define AST_FORMAT_FIRST_VIDEO_BIT AST_FORMAT_H261
 /*! H.263 Video */
 #define AST_FORMAT_H263       (1ULL << 19)
 /*! H.263+ Video */

Modified: branches/1.8/main/file.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/file.c?view=diff&rev=321335&r1=321334&r2=321335
==============================================================================
--- branches/1.8/main/file.c (original)
+++ branches/1.8/main/file.c Fri May 27 16:54:54 2011
@@ -672,7 +672,7 @@
 	if (buf == NULL)
 		return NULL;
 
-	for (format = AST_FORMAT_AUDIO_MASK + 1; format <= AST_FORMAT_VIDEO_MASK; format = format << 1) {
+	for (format = AST_FORMAT_FIRST_VIDEO_BIT; format <= AST_FORMAT_VIDEO_MASK; format = format << 1) {
 		int fd;
 		const char *fmt;