View | Details | Raw Unified | Return to bug 83689 | Differences between
and this patch

Collapse All | Expand All

(-)mplex/main.cpp (-1 / +22 lines)
Lines 38-43 Link Here
38
#endif
38
#endif
39
#include <ctype.h>
39
#include <ctype.h>
40
#include <math.h>
40
#include <math.h>
41
#include <fcntl.h>
41
#include "cpu_accel.h"
42
#include "cpu_accel.h"
42
#include "mjpeg_types.h"
43
#include "mjpeg_types.h"
43
#include "mjpeg_logging.h"
44
#include "mjpeg_logging.h"
Lines 107-112 Link Here
107
		mjpeg_error_exit1( "Could not open for writing: %s", cur_filename );
108
		mjpeg_error_exit1( "Could not open for writing: %s", cur_filename );
108
	}
109
	}
109
110
111
	{
112
		int	flags;
113
114
		(void)fcntl(fileno(strm), F_GETFL, &flags);
115
		(void)fcntl(fileno(strm), F_SETFL, flags & ~O_NONBLOCK);
116
	}
117
110
	return 0;
118
	return 0;
111
}
119
}
112
120
Lines 144-149 Link Here
144
	{
152
	{
145
		mjpeg_error_exit1( "Could not open for writing: %s", cur_filename );
153
		mjpeg_error_exit1( "Could not open for writing: %s", cur_filename );
146
	}
154
	}
155
	{
156
		int	flags;
157
158
		(void)fcntl(fileno(strm), F_GETFL, &flags);
159
		(void)fcntl(fileno(strm), F_SETFL, flags & ~O_NONBLOCK);
160
	}
147
}
161
}
148
162
149
void
163
void
Lines 200-205 Link Here
200
	{
214
	{
201
		mjpeg_error_exit1( "Unable to open file %s for reading.", bs_filename);
215
		mjpeg_error_exit1( "Unable to open file %s for reading.", bs_filename);
202
	}
216
	}
217
218
	{
219
		int	flags;
220
221
		(void)fcntl(fileno(fileh), F_GETFL, &flags);
222
		(void)fcntl(fileno(fileh), F_SETFL, flags & ~O_NONBLOCK);
223
	}
224
203
	filename = strcpy( new char[strlen(bs_filename)+1], bs_filename );
225
	filename = strcpy( new char[strlen(bs_filename)+1], bs_filename );
204
    streamname = filename;
226
    streamname = filename;
205
227
206
----8<------8<------8<-----

Return to bug 83689