]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
missed a spot on last conf commit
authorAnthony Minessale <anthm@freeswitch.org>
Thu, 5 Sep 2013 21:45:10 +0000 (02:45 +0500)
committerAnthony Minessale <anthm@freeswitch.org>
Thu, 5 Sep 2013 21:45:10 +0000 (02:45 +0500)
src/include/switch_utils.h
src/switch_core_io.c

index f4aa3d7f28bfb580281f336cf36cfd7e5c4da2cc..971a915badf63e45d87707328ff9ab8a97232ef9 100644 (file)
@@ -939,7 +939,7 @@ SWITCH_DECLARE(char *) switch_util_quote_shell_arg(const char *string);
 SWITCH_DECLARE(char *) switch_util_quote_shell_arg_pool(const char *string, switch_memory_pool_t *pool);
 
 
-#define SWITCH_READ_ACCEPTABLE(status) (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK)
+#define SWITCH_READ_ACCEPTABLE(status) (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK || status == SWITCH_STATUS_INUSE)
 SWITCH_DECLARE(char *) switch_url_encode(const char *url, char *buf, size_t len);
 SWITCH_DECLARE(char *) switch_url_decode(char *s);
 SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
index 3eb9852e20690cb8a49e7711fc271308dfe123e8..2b3c3b6d6611c08ed85a2ae2f58d6b4a82d187bf 100644 (file)
@@ -79,6 +79,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core
                }
        }
 
+       if (status == SWITCH_STATUS_INUSE) {
+               *frame = &runtime.dummy_cng_frame;
+               switch_yield(20000);
+               return SWITCH_STATUS_SUCCESS;
+       }
+
        if (status != SWITCH_STATUS_SUCCESS) {
                goto done;
        }