From 293a8f011bc74b9089cff8c1a52e51d4cb578b2d Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 24 Feb 2010 01:30:53 +0000 Subject: src/dxr3/compat.h needs to be in the tarball... --- src/dxr3/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index f6beb521a..1027d0e44 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -18,6 +18,8 @@ if HAVE_LIBRTE link_rte = -lrte endif +EXTRA_DIST = compat.c + xineplug_LTLIBRARIES = $(dxr3_modules) xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c -- cgit v1.2.3 From b808b9acc254027fa881c3123ab1b73984e2c1dd Mon Sep 17 00:00:00 2001 From: Ulrich Eckhardt Date: Sun, 21 Feb 2010 20:12:01 +0100 Subject: Avoid invalid fstat calls when opening empty files When opening empty files with xine, it reports: > This is xine (X11 gui) - a free video player v0.99.6cvs. > (c) 2000-2007 The xine Team. > system call fstat: Bad file descriptor > system call fstat: Bad file descriptor > call failed > object not accessible > object not accessible > call failed The problem was that when detecting an empty file, it is closed, but the file descriptor in struct file_input_plugin_t is still left at the previous value, causing the errors when it is used later. --- src/input/input_file.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/input/input_file.c b/src/input/input_file.c index 208a5420e..b0da2565d 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -409,6 +409,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; -- cgit v1.2.3 From f6fe1935082d9dc1c6f923e80f62c9e9c90d1169 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 24 Feb 2010 23:57:04 +0000 Subject: Fix up V4L/V4L2 for non-Linux. --- src/input/Makefile.am | 5 ++++- src/input/input_v4l2.c | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 1c34f9aaa..beb101f8c 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -21,10 +21,13 @@ endif if HAVE_V4L in_v4l = xineplug_inp_v4l.la -in_v4l2 = xineplug_inp_v4l2.la in_pvr = xineplug_inp_pvr.la endif +if HAVE_V4L2 +in_v4l2 = xineplug_inp_v4l2.la +endif + if HAVE_GNOME_VFS in_gnome_vfs = xineplug_inp_gnome_vfs.la endif diff --git a/src/input/input_v4l2.c b/src/input/input_v4l2.c index 255b1f17c..5396594f4 100644 --- a/src/input/input_v4l2.c +++ b/src/input/input_v4l2.c @@ -37,7 +37,13 @@ #include #include #include -#include +#ifdef HAVE_SYS_VIDEOIO_H +# include +#elif defined(HAVE_SYS_VIDEODEV2_H) +# include +#else +# include +#endif #include #include #include -- cgit v1.2.3 From cb82d7b686affd1d90e72b88acddf8d8d99ed972 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 25 Feb 2010 00:02:29 +0000 Subject: Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c. --- src/input/libreal/rmff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c index 6a2b761e1..82554a350 100644 --- a/src/input/libreal/rmff.c +++ b/src/input/libreal/rmff.c @@ -375,7 +375,7 @@ static rmff_mdpr_t *rmff_scan_mdpr(const char *data) mdpr->mime_type[mdpr->mime_type_size]=0; 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 = malloc(mdpr->type_specific_len); if (!mdpr->type_specific_data) -- cgit v1.2.3 From cdeee7eb6710adb3fee02c4e5f1e7493f2af70cc Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 25 Feb 2010 00:09:11 +0000 Subject: isatty() takes an int, not a FILE *. --- src/input/net_buf_ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c index 1ac0cb066..e8af1ae3f 100644 --- a/src/input/net_buf_ctrl.c +++ b/src/input/net_buf_ctrl.c @@ -133,7 +133,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); } -- cgit v1.2.3 From 5dc1f14b931db97076d32bb1285354fa304ebae2 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 25 Feb 2010 00:48:12 +0000 Subject: Compiler warning fixes. --- src/input/libdvdnav/decoder.c | 2 +- src/input/libdvdnav/ifo_read.c | 4 ++-- src/input/libdvdnav/vmcmd.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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, "]"); } } -- cgit v1.2.3 From 032fc4e2349ca6d047110311eb8f69b4556ee3e6 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 25 Feb 2010 18:06:31 +0000 Subject: Fix build with the old, outdated and deprecated internal ffmpeg. --- src/combined/ffmpeg/ffmpeg_decoder.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/combined/ffmpeg/ffmpeg_decoder.c b/src/combined/ffmpeg/ffmpeg_decoder.c index adf0dad78..6d0bfa432 100644 --- a/src/combined/ffmpeg/ffmpeg_decoder.c +++ b/src/combined/ffmpeg/ffmpeg_decoder.c @@ -228,7 +228,6 @@ void avcodec_register_all(void) REGISTER_DECODER(WAVPACK, wavpack); REGISTER_DECODER(WMAV1, wmav1); REGISTER_DECODER(WMAV2, wmav2); - REGISTER_DECODER(WMAPRO, wmapro); REGISTER_DECODER(WS_SND1, ws_snd1); /* pcm codecs */ -- cgit v1.2.3