From: Leif Madsen <leif@leifmadsen.com>
Date: Fri, 27 May 2011 21:54:54 +0000 (+0000)
Subject: Fix issue with playback of H.261 video.
X-Git-Tag: 1.8.5-rc1~11^2~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9718442188aef5464805eac2cd3e76bf2b4d6aba;p=thirdparty%2Fasterisk.git

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)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@321335 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index 6b89c34e32..f3f1f3a12a 100644
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -278,6 +278,7 @@ extern struct ast_frame ast_null_frame;
 #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 */
diff --git a/main/file.c b/main/file.c
index 6f0cdd4463..9195748af4 100644
--- a/main/file.c
+++ b/main/file.c
@@ -672,7 +672,7 @@ struct ast_filestream *ast_openvstream(struct ast_channel *chan, const char *fil
 	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;