FS-7514: fix binary &

This commit is contained in:
Seven Du authored and Michael Jerris committed 2015-05-28 12:47:10 -05:00
1 parent 41577304ad
commit 39bd8adbdc
1 file changed
+2 -2
+2 -2
View File
@@ -1044,7 +1044,7 @@ static switch_status_t vlc_file_read_video(switch_file_handle_t *handle, switch_
return SWITCH_STATUS_FALSE; 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) { if (switch_queue_trypop(vcontext->video_queue, &pop) == SWITCH_STATUS_SUCCESS) {
switch_image_t *img = (switch_image_t *) pop; switch_image_t *img = (switch_image_t *) pop;
switch_img_free(&img); 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 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) static switch_status_t vlc_file_write_video(switch_file_handle_t *handle, switch_frame_t *frame)