Skip to content

V
vlc-2-2
Commit 564e94a3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

v4l2: missing cancellation inhibition

parent c270dd7b
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
modules/access/v4l2/vbi.c
View file @ 564e94a3
...@@ -75,6 +75,7 @@ void GrabVBI( demux_t *p_demux, vbi_capture *vbi_cap, ...@@ -75,6 +75,7 @@ void GrabVBI( demux_t *p_demux, vbi_capture *vbi_cap,
vbi_capture_buffer *sliced_bytes; vbi_capture_buffer *sliced_bytes;
struct timeval timeout={0,0}; /* poll */ struct timeval timeout={0,0}; /* poll */
int n_lines; int n_lines;
int canc = vlc_savecancel ();
int r = vbi_capture_pull_sliced (vbi_cap, &sliced_bytes, &timeout); int r = vbi_capture_pull_sliced (vbi_cap, &sliced_bytes, &timeout);
switch (r) { switch (r) {
...@@ -126,6 +127,6 @@ void GrabVBI( demux_t *p_demux, vbi_capture *vbi_cap, ...@@ -126,6 +127,6 @@ void GrabVBI( demux_t *p_demux, vbi_capture *vbi_cap,
block_Release(p_block); block_Release(p_block);
} }
return; vlc_restorecancel (canc);
} }
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment