diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dxr3/Makefile.am | 2 | ||||
| -rw-r--r-- | src/input/Makefile.am | 5 | ||||
| -rw-r--r-- | src/input/input_file.c | 1 | ||||
| -rw-r--r-- | src/input/input_v4l2.c | 8 | ||||
| -rw-r--r-- | src/input/libdvdnav/decoder.c | 2 | ||||
| -rw-r--r-- | src/input/libdvdnav/ifo_read.c | 4 | ||||
| -rw-r--r-- | src/input/libdvdnav/vmcmd.c | 2 | ||||
| -rw-r--r-- | src/input/libreal/rmff.c | 2 | ||||
| -rw-r--r-- | src/input/net_buf_ctrl.c | 2 |
9 files changed, 20 insertions, 8 deletions
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); } |