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 6b89c34e3233604176ba0d1ca2ab3574b2aaab6d..f3f1f3a12a069e10bb53513360d6f1621435346f 100644 (file)
--- 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 6f0cdd44639c93e3c4a98e1c7a100e9f77058fb3..9195748af46ece9bf4932fc06a32d30e5dd3b4ad 100644 (file)
--- 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;