diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-06 01:29:55 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-06 01:29:55 +0000 |
| commit | fd6d1cc6ccda5ff8319ae0eb8417c5db5700938a (patch) | |
| tree | a675486a37a9df46add79cfaf2c9f17f82d251c8 | |
| parent | 1cb9832ac0b6a132b172302ad76f68f16e3487e1 (diff) | |
| download | xine-lib-fd6d1cc6ccda5ff8319ae0eb8417c5db5700938a.tar.gz xine-lib-fd6d1cc6ccda5ff8319ae0eb8417c5db5700938a.tar.bz2 | |
libv4l check shouldn't fail & abort unless --enable-libv4l is given.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/input/net_buf_ctrl.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index e039f4855..75de5e405 100644 --- a/configure.ac +++ b/configure.ac @@ -698,7 +698,8 @@ if test "x$have_v4l" = xyes; then have_libv4l=no PKG_CHECK_MODULES([V4L2], [libv4l2], [have_libv4l=yes - AC_DEFINE([HAVE_LIBV4L2_H], [1], [Define this if you have libv4l installed])]) + AC_DEFINE([HAVE_LIBV4L2_H], [1], [Define this if you have libv4l installed])], + [have_libv4l=no]) if test "x$enable_libv4l" = "xyes" && test "x$have_libv4l" = "xno"; then AC_MSG_ERROR([libv4l requested but not found.]) fi diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c index 1d01911fd..1ac0cb066 100644 --- a/src/input/net_buf_ctrl.c +++ b/src/input/net_buf_ctrl.c @@ -122,7 +122,7 @@ static void display_stats (nbc_t *this) { static const char enabled[2][4] = {"off", "on "}; printf("net_buf_ctrl: vid %3d%% %4.1fs %4" PRId64 "kbps %1d, "\ - "aud %3d%% %4.1fs %4" PRId64 "kbps %1d, %s %s\r", + "aud %3d%% %4.1fs %4" PRId64 "kbps %1d, %s %s%c", this->video_fifo_fill, (float)(this->video_fifo_length / 1000), this->video_br / 1000, @@ -132,7 +132,8 @@ static void display_stats (nbc_t *this) { this->audio_br / 1000, this->audio_in_disc, buffering[this->buffering], - enabled[this->enabled] + enabled[this->enabled], + isatty (stdout) ? '\r' : '\n' ); fflush(stdout); } |