[Mplayer-cvslog] CVS: main/libmpcodecs vf_bmovl.c,1.9,1.10
Alex Beregszaszi
alex at mplayerhq.hu
Sun Oct 5 16:17:59 CEST 2003
Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv1174
Modified Files:
vf_bmovl.c
Log Message:
correct handling of select ret=0, patch by Jonas Jensen <jbj at knef.dk>
Index: vf_bmovl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_bmovl.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vf_bmovl.c 26 Jun 2003 11:17:28 -0000 1.9
+++ vf_bmovl.c 5 Oct 2003 14:17:29 -0000 1.10
@@ -214,11 +214,13 @@
if(vf->priv->stream_fd >= 0) {
struct timeval tv;
+ int ready;
FD_SET( vf->priv->stream_fd, &vf->priv->stream_fdset );
tv.tv_sec=0; tv.tv_usec=0;
- if( select( vf->priv->stream_fd+1, &vf->priv->stream_fdset, NULL, NULL, &tv ) > 0) {
+ ready = select( vf->priv->stream_fd+1, &vf->priv->stream_fdset, NULL, NULL, &tv );
+ if(ready > 0) {
// We've got new data from the FIFO
char cmd[20], args[100];
@@ -362,7 +364,9 @@
} // for buf_x
} // for buf_y
free (buffer);
- } else if(errno) mp_msg(MSGT_VFILTER, MSGL_WARN, "\nvf_bmovl: Error %d in fifo: %s\n\n", errno, strerror(errno));
+ } else if(ready < 0) {
+ mp_msg(MSGT_VFILTER, MSGL_WARN, "\nvf_bmovl: Error %d in fifo: %s\n\n", errno, strerror(errno));
+ }
}
if(vf->priv->hidden) return vf_next_put_image(vf, dmpi);
More information about the MPlayer-cvslog
mailing list