summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.hgtags2
-rw-r--r--ChangeLog8
-rw-r--r--debian/changelog4
-rw-r--r--m4/input.m425
-rw-r--r--m4/summary.m41
-rw-r--r--src/dxr3/Makefile.am2
-rw-r--r--src/input/Makefile.am5
-rw-r--r--src/input/input_file.c1
-rw-r--r--src/input/input_v4l2.c8
-rw-r--r--src/input/libdvdnav/decoder.c2
-rw-r--r--src/input/libdvdnav/ifo_read.c4
-rw-r--r--src/input/libdvdnav/vmcmd.c2
-rw-r--r--src/input/libreal/rmff.c2
-rw-r--r--src/input/net_buf_ctrl.c2
14 files changed, 54 insertions, 14 deletions
diff --git a/.hgtags b/.hgtags
index 8b79c5a23..1781baab3 100644
--- a/.hgtags
+++ b/.hgtags
@@ -156,3 +156,5 @@ e33280bcaa3b1f3f5b93e633e2225e2440ecfd7c 1.1.16
ff19463729d8f9bbea35171d641c5f28cdacc7c8 1.1.16.2
fc1aecbb9d80a32d9c802a5208dfdc012f1ba9d5 1.1.16.3
ff764395a361257b11d73583a0e0851e0f5f2ee5 1.1.17
+86395fcaded38aca33facf7c8263d23622eea2bd 1.1.18
+8b7c25bfb056ee9b907877b462c132e61112e440 1.1.18.1
diff --git a/ChangeLog b/ChangeLog
index cefda3f73..4b2808aba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,7 +70,13 @@ xine-lib (1.1.90) (Unreleased)
* Report more video output capabilities via (port)->get_capabilities():
colour controls, zooming, colour keying.
-xine-lib (1.1.18) 20??-??-??
+xine-lib (1.1.18.1) 2010-03-06
+ * Oops. compat.c (for DXR3 support) was omitted.
+ * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L.
+ * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c.
+ * Fix build with the old, outdated and deprecated internal ffmpeg.
+
+xine-lib (1.1.18) 2010-02-23
* Bump the FLAC decoder's priority above ffmpegaudio. This should fix
various problems with FLAC playback.
* Build fix (undefined symbol) for when using older ffmpeg.
diff --git a/debian/changelog b/debian/changelog
index 3a9d8a453..c08d6194b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,11 @@ xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low
-- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 17 Apr 2007 16:50:37 +0100
-xine-lib (1.1.18~hg-0) unstable; urgency=low
+xine-lib (1.1.19~hg-0) unstable; urgency=low
* Hg snapshot (dev build). Changelog is irrelevant :-)
- -- Darren Salt <linux@youmustbejoking.demon.co.uk> Fri, 04 Dec 2009 17:15:06 +0000
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 23 Feb 2010 22:49:45 +0000
xine-lib (1.1.5~cvs-0) unstable; urgency=low
diff --git a/m4/input.m4 b/m4/input.m4
index 04c480720..6165bd1be 100644
--- a/m4/input.m4
+++ b/m4/input.m4
@@ -13,6 +13,8 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
default_enable_gnomevfs=yes
default_enable_samba=yes
default_enable_v4l=no
+ default_enable_v4l2=no
+ default_enable_libv4l=no
default_enable_vcd=yes
default_enable_vcdo=no
default_enable_vdr=yes
@@ -30,17 +32,23 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
freebsd*)
default_enable_vcdo=yes
;;
+ netbsd* | openbsd*)
+ default_enable_v4l2=yes
+ ;;
linux*)
default_enable_dvb=yes
default_enable_v4l=yes
+ default_enable_v4l2=yes
+ default_enable_libv4l=yes
default_enable_vcdo=yes
;;
solaris*)
default_enable_vcdo=yes
+ default_enable_v4l2=yes
;;
esac
- default_enable_libv4l="$default_enable_v4l"
+ dnl default_enable_libv4l="$default_enable_v4l2"
dnl dvb
XINE_ARG_ENABLE([dvb], [Enable support for the DVB plugin (Linux only)])
@@ -84,11 +92,22 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
XINE_ARG_ENABLE([v4l], [Enable Video4Linux support])
if test x"$enable_v4l" != x"no"; then
have_v4l=yes
- AC_CHECK_HEADERS([linux/videodev.h linux/videodev2.h], , [have_v4l=no])
+ AC_CHECK_HEADERS([linux/videodev.h], , [have_v4l=no])
AC_CHECK_HEADERS([asm/types.h])
if test x"$hard_enable_v4l" = x"yes" && test x"$have_v4l" != x"yes"; then
AC_MSG_ERROR([Video4Linux support requested, but prerequisite headers not found.])
fi
+ fi
+ AM_CONDITIONAL([ENABLE_V4L], [test x"$have_v4l" = x"yes"])
+
+ XINE_ARG_ENABLE([v4l2], [Enable Video4Linux 2 support])
+ if test x"$enable_v4l2" != x"no"; then
+ have_v4l2=yes
+ AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h sys/videodev2.h], [have_v4l2=yes], [])
+ AC_CHECK_HEADERS([asm/types.h])
+ if test x"$hard_enable_v4l2" = x"yes" && test x"$have_v4l2" != x"yes"; then
+ AC_MSG_ERROR([Video4Linux 2 support requested, but prerequisite headers not found.])
+ fi
XINE_ARG_ENABLE([libv4l], [Enable libv4l support])
if test "x$enable_libv4l" != "xno"; then
PKG_CHECK_MODULES([V4L2], [libv4l2],
@@ -100,7 +119,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
fi
fi
fi
- AM_CONDITIONAL([ENABLE_V4L], [test x"$have_v4l" = x"yes"])
+ AM_CONDITIONAL([ENABLE_V4L2], [test x"$have_v4l2" = x"yes"])
dnl dvdnav
dnl XXX: This could be cleaned up so that code does not have to ifdef so much
diff --git a/m4/summary.m4 b/m4/summary.m4
index 0acfc933a..c5b9a4132 100644
--- a/m4/summary.m4
+++ b/m4/summary.m4
@@ -29,6 +29,7 @@ AC_DEFUN([XINE_LIB_SUMMARY], [
test x"$have_gnomevfs" = x"yes" && echo " - gnome-vfs"
test x"$have_samba" = x"yes" && echo " - smb"
test x"$have_v4l" = x"yes" && echo " - v4l"
+ test x"$have_v4l2" = x"yes" && echo " - v4l2"
echo " - cdda"
echo ""
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index 1440efd12..5f587fd90 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -17,6 +17,8 @@ if HAVE_LIBRTE
link_rte = -lrte
endif
+EXTRA_DIST = compat.c
+
noinst_HEADERS = em8300.h dxr3.h dxr3_scr.h video_out_dxr3.h
if ENABLE_DXR3
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 608b7e68f..d0a5c9638 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -33,10 +33,13 @@ endif
if ENABLE_V4L
in_v4l = xineplug_inp_v4l.la
-in_v4l2 = xineplug_inp_v4l2.la
in_pvr = xineplug_inp_pvr.la
endif
+if ENABLE_V4L2
+in_v4l2 = xineplug_inp_v4l2.la
+endif
+
if ENABLE_GNOME_VFS
in_gnome_vfs = xineplug_inp_gnome_vfs.la
endif
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 29e8f74ca..2fcd87d73 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -408,6 +408,7 @@ static int file_plugin_open (input_plugin_t *this_gen ) {
if (file_plugin_get_length (this_gen) == 0) {
_x_message(this->stream, XINE_MSG_FILE_EMPTY, this->mrl, NULL);
close (this->fh);
+ this->fh = -1;
xine_log (this->stream->xine, XINE_LOG_MSG,
_("input_file: File empty: >%s<\n"), this->mrl);
return -1;
diff --git a/src/input/input_v4l2.c b/src/input/input_v4l2.c
index ef08a63ee..b2938d609 100644
--- a/src/input/input_v4l2.c
+++ b/src/input/input_v4l2.c
@@ -37,7 +37,13 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <linux/videodev2.h>
+#ifdef HAVE_SYS_VIDEOIO_H
+# include <sys/videoio.h>
+#elif defined(HAVE_SYS_VIDEODEV2_H)
+# include <sys/videodev2.h>
+#else
+# include <linux/videodev2.h>
+#endif
#include <sys/mman.h>
#include <stdio.h>
#include <errno.h>
diff --git a/src/input/libdvdnav/decoder.c b/src/input/libdvdnav/decoder.c
index 3dff4a080..4ae64377b 100644
--- a/src/input/libdvdnav/decoder.c
+++ b/src/input/libdvdnav/decoder.c
@@ -569,7 +569,7 @@ static int32_t eval_command(uint8_t *bytes, registers_t* registers, link_t *retu
if(command.instruction & ~ command.examined) {
fprintf(MSG_OUT, "libdvdnav: decoder.c: [WARNING, unknown bits:");
- fprintf(MSG_OUT, " %08llx", (command.instruction & ~ command.examined) );
+ fprintf(MSG_OUT, " %08"PRIx64, (command.instruction & ~ command.examined) );
fprintf(MSG_OUT, "]\n");
}
diff --git a/src/input/libdvdnav/ifo_read.c b/src/input/libdvdnav/ifo_read.c
index bc1ba580b..61500caa2 100644
--- a/src/input/libdvdnav/ifo_read.c
+++ b/src/input/libdvdnav/ifo_read.c
@@ -654,10 +654,10 @@ static int ifoRead_PGC(ifo_handle_t *ifofile, pgc_t *pgc, unsigned int offset) {
/* verify time (look at print_time) */
for(i = 0; i < 8; i++)
- if(!pgc->audio_control[i] & 0x8000) /* The 'is present' bit */
+ if(!(pgc->audio_control[i] & 0x8000)) /* The 'is present' bit */
CHECK_ZERO(pgc->audio_control[i]);
for(i = 0; i < 32; i++)
- if(!pgc->subp_control[i] & 0x80000000) /* The 'is present' bit */
+ if(!(pgc->subp_control[i] & 0x80000000)) /* The 'is present' bit */
CHECK_ZERO(pgc->subp_control[i]);
/* Check that time is 0:0:0:0 also if nr_of_programs == 0 */
diff --git a/src/input/libdvdnav/vmcmd.c b/src/input/libdvdnav/vmcmd.c
index 24bdfe6e2..84a90dfd6 100644
--- a/src/input/libdvdnav/vmcmd.c
+++ b/src/input/libdvdnav/vmcmd.c
@@ -517,7 +517,7 @@ void vm_print_mnemonic(vm_cmd_t *vm_command) {
if(command.instruction & ~ command.examined) {
fprintf(MSG_OUT, " libdvdnav: vmcmd.c: [WARNING, unknown bits:");
- fprintf(MSG_OUT, " %08llx", (command.instruction & ~ command.examined) );
+ fprintf(MSG_OUT, " %08"PRIx64, (command.instruction & ~ command.examined) );
fprintf(MSG_OUT, "]");
}
}
diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c
index f330e4844..5690eb14b 100644
--- a/src/input/libreal/rmff.c
+++ b/src/input/libreal/rmff.c
@@ -371,7 +371,7 @@ static rmff_mdpr_t *rmff_scan_mdpr(const char *data)
goto fail;
mdpr->type_specific_len=_X_BE_32(&data[42+mdpr->stream_name_size+mdpr->mime_type_size]);
- if (mdpr->size < 46 + mdpr->stream_name_size + mdpr->mime_type_size + mdpr->type_specific_data)
+ if (mdpr->size < 46 + mdpr->stream_name_size + mdpr->mime_type_size + mdpr->type_specific_len)
goto fail;
mdpr->type_specific_data = xine_memdup(&data[46+mdpr->stream_name_size+mdpr->mime_type_size], mdpr->type_specific_len);
if (!mdpr->type_specific_data)
diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c
index b7a52eb2b..c0345f652 100644
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -129,7 +129,7 @@ static void display_stats (nbc_t *this) {
this->audio_in_disc,
buffering[this->buffering],
enabled[this->enabled],
- isatty (stdout) ? '\r' : '\n'
+ isatty (STDOUT_FILENO) ? '\r' : '\n'
);
fflush(stdout);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 10:04:03 +0000