summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-05-15 21:19:35 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-05-15 21:19:35 +0300
commita41db36b22053c2cf103899f3510f68ff5645662 (patch)
treee2e3d734a828caf8e1fbf1373d818f06c979e53d /input
parent267a3f4c9c00848f32c341595d2d831157a79bee (diff)
parent84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff)
downloadmpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2
mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz
Merge svn changes up to r26783
Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
Diffstat (limited to 'input')
-rw-r--r--input/ar.c6
-rw-r--r--input/ar.h6
-rw-r--r--input/input.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/input/ar.c b/input/ar.c
index 0f48a50716..41e7736e45 100644
--- a/input/ar.c
+++ b/input/ar.c
@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with MPlayer; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <IOKit/IOCFPlugIn.h>
diff --git a/input/ar.h b/input/ar.h
index ae763acdad..a52dccc4c8 100644
--- a/input/ar.h
+++ b/input/ar.h
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with MPlayer; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPLAYER_AR_H
diff --git a/input/input.c b/input/input.c
index 4bc88c2a94..dee2f3a7f7 100644
--- a/input/input.c
+++ b/input/input.c
@@ -1218,7 +1218,7 @@ static mp_cmd_t *read_events(struct input_ctx *ictx, int time, int paused)
}
}
#else
- if (!got_cmd)
+ if (!got_cmd && time)
usec_sleep(time * 1000);
#endif