[vlc-commits] v4l2: missing cancellation inhibition

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Dec 12 18:47:38 2012 +0200| [564e94a3fcae62d3ce335e55d6308d0470b60039] | committer: Rémi Denis-Courmont

v4l2: missing cancellation inhibition

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=564e94a3fcae62d3ce335e55d6308d0470b60039
---

 modules/access/v4l2/vbi.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/access/v4l2/vbi.c b/modules/access/v4l2/vbi.c
index 36394ab..b25f9c9 100644
--- a/modules/access/v4l2/vbi.c
+++ b/modules/access/v4l2/vbi.c
@@ -75,6 +75,7 @@ void GrabVBI( demux_t *p_demux, vbi_capture *vbi_cap,
     vbi_capture_buffer *sliced_bytes;
     struct timeval timeout={0,0}; /* poll */
     int n_lines;
+    int canc = vlc_savecancel ();
 
     int r = vbi_capture_pull_sliced (vbi_cap, &sliced_bytes, &timeout);
     switch (r) {
@@ -126,6 +127,6 @@ void GrabVBI( demux_t *p_demux, vbi_capture *vbi_cap,
         block_Release(p_block);
     }
 
-    return;
+    vlc_restorecancel (canc);
 }
 #endif