]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7514: fix binary &
authorSeven Du <dujinfang@gmail.com>
Tue, 10 Mar 2015 04:16:18 +0000 (12:16 +0800)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:10 +0000 (12:47 -0500)
src/mod/formats/mod_vlc/mod_vlc.c

index c5bba681aef8471c002ae5092bf1f1cac841f203..3526b8f0477bb3f6dc3fd204cbcd2b482d56bcf3 100644 (file)
@@ -731,7 +731,7 @@ static switch_status_t vlc_file_open(switch_file_handle_t *handle, const char *p
                        realpath = path;
                        path = switch_core_sprintf(context->pool, "#transcode{vcodec=h264,acodec=mp3}:std{access=file,mux=mp4,dst=%s}", path);
                } else if (handle->stream_name && !strcasecmp(handle->stream_name, "rtmp")) {
-                       path = switch_core_sprintf(context->pool, 
+                       path = switch_core_sprintf(context->pool,
                                                                           "#transcode{venc=x264{keyint=25},"
                                                                           "vcodec=h264,"
                                                                           "scale=1,"
@@ -1044,7 +1044,7 @@ static switch_status_t vlc_file_read_video(switch_file_handle_t *handle, switch_
                return SWITCH_STATUS_FALSE;
        }
        
-       while((flags && SVR_FLUSH) && switch_queue_size(vcontext->video_queue) > 1) {
+       while((flags & SVR_FLUSH) && switch_queue_size(vcontext->video_queue) > 1) {
                if (switch_queue_trypop(vcontext->video_queue, &pop) == SWITCH_STATUS_SUCCESS) {
                        switch_image_t *img = (switch_image_t *) pop;
                        switch_img_free(&img);
@@ -1076,7 +1076,7 @@ static switch_status_t vlc_file_read_video(switch_file_handle_t *handle, switch_
                return SWITCH_STATUS_SUCCESS;
        }
 
-       return (flags && SVR_FLUSH) ? SWITCH_STATUS_BREAK : status;
+       return (flags & SVR_FLUSH) ? SWITCH_STATUS_BREAK : status;
 }
 
 static switch_status_t vlc_file_write_video(switch_file_handle_t *handle, switch_frame_t *frame)