Skip to content

V
vlc
Commit 57a25813 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

v4l2: remove broken VBI in user pointer mode (refs #8262)

parent 8d5cdf7f
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 27 deletions
modules/access/v4l2/demux.c
View file @ 57a25813
...@@ -537,15 +537,6 @@ static void *UserPtrThread (void *data) ...@@ -537,15 +537,6 @@ static void *UserPtrThread (void *data)
ufd[0].fd = fd; ufd[0].fd = fd;
ufd[0].events = POLLIN; ufd[0].events = POLLIN;
#ifdef ZVBI_COMPILED
if (sys->vbi != NULL)
{
ufd[1].fd = GetFdVBI (sys->vbi);
ufd[1].events = POLLIN;
numfds++;
}
#endif
int canc = vlc_savecancel (); int canc = vlc_savecancel ();
for (;;) for (;;)
{ {
...@@ -566,8 +557,6 @@ static void *UserPtrThread (void *data) ...@@ -566,8 +557,6 @@ static void *UserPtrThread (void *data)
vlc_cleanup_pop (); vlc_cleanup_pop ();
canc = vlc_savecancel (); canc = vlc_savecancel ();
if( ufd[0].revents )
{
if (v4l2_ioctl (fd, VIDIOC_DQBUF, &buf) < 0) if (v4l2_ioctl (fd, VIDIOC_DQBUF, &buf) < 0)
{ {
msg_Err (demux, "cannot dequeue buffer: %m"); msg_Err (demux, "cannot dequeue buffer: %m");
...@@ -582,11 +571,6 @@ static void *UserPtrThread (void *data) ...@@ -582,11 +571,6 @@ static void *UserPtrThread (void *data)
es_out_Control (demux->out, ES_OUT_SET_PCR, block->i_pts); es_out_Control (demux->out, ES_OUT_SET_PCR, block->i_pts);
es_out_Send (demux->out, sys->es, block); es_out_Send (demux->out, sys->es, block);
} }
#ifdef ZVBI_COMPILED
if (sys->vbi != NULL && ufd[1].revents)
GrabVBI (demux, sys->vbi);
#endif
}
vlc_restorecancel (canc); /* <- hmm, this is purely cosmetic */ vlc_restorecancel (canc); /* <- hmm, this is purely cosmetic */
return NULL; return NULL;
} }
......
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