From daea7ecb92139d85ac0cf0e6c51ee5f88a1f226a Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 3 Jan 2012 19:08:13 +0000 Subject: Fix up sndio plugin #includes (FTBFS). --- src/audio_out/audio_sndio_out.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/audio_out/audio_sndio_out.c b/src/audio_out/audio_sndio_out.c index 48e77c3b4..55d479963 100644 --- a/src/audio_out/audio_sndio_out.c +++ b/src/audio_out/audio_sndio_out.c @@ -32,9 +32,9 @@ #include -#include "xine_internal.h" -#include "xineutils.h" -#include "audio_out.h" +#include +#include +#include #include "bswap.h" #define GAP_TOLERANCE AO_MAX_GAP -- cgit v1.2.3 From 103f464594a82d1931f122587988aaa0effc2a08 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Tue, 3 Jan 2012 20:06:08 +0000 Subject: Fix VDR input plugin build. --- src/vdr/input_vdr.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c index 793d1b41b..53da46c51 100644 --- a/src/vdr/input_vdr.c +++ b/src/vdr/input_vdr.c @@ -33,6 +33,7 @@ #include #include +#include #include #include -- cgit v1.2.3 From 2ffb29a9ee24348269113566e142e28b9f863bd6 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 10 Jan 2012 14:49:32 +0200 Subject: Fixed include order --- src/video_out/video_out_fb.c | 5 ++--- src/video_out/video_out_xshm.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index cfc5cf3a6..0d4376336 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -54,9 +54,6 @@ #include #include -#include "xine.h" -#include - #include #include @@ -84,6 +81,8 @@ #define LOG */ +#include "xine.h" +#include #include #include "yuv2rgb.h" #include diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 675575e80..5dfc2c34e 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -34,9 +34,6 @@ #include #include -#include "xine.h" -#include - #include #include #include @@ -63,6 +60,8 @@ #define LOG */ +#include "xine.h" +#include #include #include "yuv2rgb.h" #include -- cgit v1.2.3 From b8f4adebb7cd66fd578b791d73e11423f61e802b Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 10 Jan 2012 14:53:08 +0200 Subject: Include xine_private.h to get xine_probe_fast_memcpy() definition --- src/xine-utils/memcpy.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c index 515919a41..f90ab275a 100644 --- a/src/xine-utils/memcpy.c +++ b/src/xine-utils/memcpy.c @@ -53,6 +53,7 @@ */ #include +#include "../xine-engine/xine_private.h" void *(* xine_fast_memcpy)(void *to, const void *from, size_t len); -- cgit v1.2.3 From b5f513e9fff362ef90df7feff05464acaed58a03 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 10 Jan 2012 14:57:21 +0200 Subject: Removed unused variable from enum definition --- src/xine-utils/xmllexer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c index 4e72ba57c..a3b395a46 100644 --- a/src/xine-utils/xmllexer.c +++ b/src/xine-utils/xmllexer.c @@ -96,11 +96,12 @@ void lexer_init(const char * buf, int size) { static_lexer = lexer_init_r(buf, size); } -static enum { + +enum { NORMAL, DATA, CDATA, -} lex_mode = NORMAL; +}; struct lexer *lexer_init_r(const char * buf, int size) { static const char boms[] = { 0xFF, 0xFE, 0, 0, 0xFE, 0xFF }, -- cgit v1.2.3 From 2f744e75713bfdab5832ebe6516cf3c96e6ffbf1 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 10 Jan 2012 14:58:13 +0200 Subject: Fixed printf argument --- src/xine-utils/xmlparser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c index 8619b1be8..deee2550f 100644 --- a/src/xine-utils/xmlparser.c +++ b/src/xine-utils/xmlparser.c @@ -855,7 +855,7 @@ static void xml_parser_dump_node (const xml_node_t *node, int indent) { free (value); p = p->next; if (p) { - printf ("\n%*s", indent+2+l, ""); + printf ("\n%*s", indent+2+(int)l, ""); } } printf (">\n"); -- cgit v1.2.3 From 00a8fc0dbeccdd7bda8246475fc2d079202b524a Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 10 Jan 2012 15:07:56 +0200 Subject: Added const --- src/libsputext/xine_sputext_decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/libsputext/xine_sputext_decoder.c b/src/libsputext/xine_sputext_decoder.c index 3090c640e..e2e37bc37 100644 --- a/src/libsputext/xine_sputext_decoder.c +++ b/src/libsputext/xine_sputext_decoder.c @@ -122,7 +122,7 @@ typedef struct sputext_class_s { char font_ft[FILENAME_MAX]; /* subtitle font */ int use_font_ft; /* use Freetype */ #endif - char *src_encoding; /* encoding of subtitle file */ + const char *src_encoding; /* encoding of subtitle file */ int use_unscaled; /* use unscaled OSD if possible */ xine_t *xine; -- cgit v1.2.3 From 330b1da779fee3942faccae5294f05853d82b8cc Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 10 Jan 2012 15:13:11 +0200 Subject: Removed unused variables --- src/spu_dec/spudvb_decoder.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') diff --git a/src/spu_dec/spudvb_decoder.c b/src/spu_dec/spudvb_decoder.c index 8cdba1baa..ec3efcb31 100644 --- a/src/spu_dec/spudvb_decoder.c +++ b/src/spu_dec/spudvb_decoder.c @@ -181,7 +181,6 @@ static void update_region (dvb_spu_decoder_t * this, int region_id, int region_w dvbsub_func_t *dvbsub = this->dvbsub; region_t *reg = &dvbsub->regions[region_id]; - page_t *page = &dvbsub->page; /* reject invalid sizes and set some limits ! */ if ( region_width<=0 || region_height<=0 || region_width>SPU_MAX_WIDTH || region_height>SPU_MAX_HEIGHT ) { @@ -730,7 +729,6 @@ static void process_object_data_segment (dvb_spu_decoder_t * this) dvbsub_func_t *dvbsub = this->dvbsub; - int j; int old_i; int r; @@ -926,7 +924,6 @@ static void spudec_decode_data (spu_decoder_t * this_gen, buf_element_t * buf) int new_i; int data_identifier, subtitle_stream_id; int segment_length, segment_type; - int PES_header_data_length; int PES_packet_length; int i; -- cgit v1.2.3 From 71ef24345912dac9e119a139608747212fdd1fee Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 10 Jan 2012 15:13:51 +0200 Subject: Fixed include --- src/spu_dec/spudvb_decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/spu_dec/spudvb_decoder.c b/src/spu_dec/spudvb_decoder.c index ec3efcb31..9153b3a65 100644 --- a/src/spu_dec/spudvb_decoder.c +++ b/src/spu_dec/spudvb_decoder.c @@ -25,7 +25,7 @@ * - Implement support for teletext based subtitles */ -#include "pthread.h" +#include #include #include #include -- cgit v1.2.3 From 9b094bb32305ca3af9a1a86dcc5674bff1c6c27c Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 10 Jan 2012 15:15:07 +0200 Subject: Define LOG_MODULE before including xine headers --- src/spu_dec/spudvb_decoder.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/spu_dec/spudvb_decoder.c b/src/spu_dec/spudvb_decoder.c index 9153b3a65..c2492db8f 100644 --- a/src/spu_dec/spudvb_decoder.c +++ b/src/spu_dec/spudvb_decoder.c @@ -27,6 +27,10 @@ #include #include + +/*#define LOG*/ +#define LOG_MODULE "spudvb" + #include #include #include @@ -35,9 +39,6 @@ #define SPU_MAX_WIDTH 1920 #define SPU_MAX_HEIGHT 1080 -/*#define LOG*/ -#define LOG_MODULE "spudvb" - typedef struct { int x, y; unsigned char is_visible; -- cgit v1.2.3 From 730b3590f7c42154dbd6c3c905b2181b99311c07 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 10 Jan 2012 15:21:30 +0200 Subject: Fixed printf format --- src/video_out/video_out_xv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 59ba3cbfe..edff2905a 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -1262,8 +1262,8 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void * if (xv_port != 0) { if (! xv_open_port(this, xv_port)) { xprintf(class->xine, XINE_VERBOSITY_NONE, - _("%s: could not open Xv port %d - autodetecting\n"), - LOG_MODULE, xv_port); + _("%s: could not open Xv port %lu - autodetecting\n"), + LOG_MODULE, (unsigned long)xv_port); xv_port = xv_autodetect_port(this, adaptors, adaptor_info, &adaptor_num, xv_port, prefer_type); } else adaptor_num = xv_find_adaptor_by_port (xv_port, adaptors, adaptor_info); -- cgit v1.2.3 From ee9eac9283590ac3dfaa11fbd742c7cbb1d437ab Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 10 Jan 2012 15:22:46 +0200 Subject: Removed unused variable --- src/xine-engine/configfile.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 924fbe02a..75fdbe527 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -1284,7 +1284,6 @@ static char* config_get_serialized_entry (config_values_t *this, const char *key int str_default_len = 0; int description_len = 0; int help_len = 0; - unsigned long output_len; unsigned long total_len; int value_count; int value_len[10]; -- cgit v1.2.3 From 65317467101790b8b898b282c0a0f5ac346173ed Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 10 Jan 2012 15:23:03 +0200 Subject: Added missing const --- src/xine-engine/configfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 75fdbe527..b334dfaa5 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -352,7 +352,7 @@ static void config_remove(config_values_t *this, cfg_entry_t *entry, cfg_entry_t prev->next = entry->next; } -static char *config_xlate_internal (const char *key, const xine_config_entry_translation_t *trans) +static const char *config_xlate_internal (const char *key, const xine_config_entry_translation_t *trans) { --trans; while ((++trans)->old_name) -- cgit v1.2.3 From 8f9bca37fbfd25506fe719898c8cf3bfc62704e8 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 10 Jan 2012 15:26:31 +0200 Subject: Pointer type fixes --- src/xine-engine/load_plugins.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index bbe5f0910..8189592ba 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -2121,7 +2121,7 @@ video_decoder_t *_x_get_video_decoder (xine_stream_t *stream, uint8_t stream_typ vd = ((video_decoder_class_t *)node->plugin_class)->open_plugin(node->plugin_class, stream); - if (vd == 1) { + if (vd == (video_decoder_t*)1) { /* HACK: plugin failed to instantiate because required resources are unavailable at that time, but may be available later, so don't remove this plugin from catalog. */ xprintf(stream->xine, XINE_VERBOSITY_DEBUG, @@ -2631,7 +2631,7 @@ void xine_post_dispose(xine_t *xine, xine_post_t *post_gen) { * @param joining String to use to join the various strings together. * @param final_length The pre-calculated final length of the string. */ -static char *_x_concatenate_with_string(char const **strings, size_t count, char *joining, size_t final_length) { +static char *_x_concatenate_with_string(char const **strings, size_t count, const char *joining, size_t final_length) { size_t i; char *const result = malloc(final_length+1); /* Better be safe */ char *str = result; @@ -2780,7 +2780,7 @@ static void dispose_plugin_list (xine_sarray_t *list, int is_cache) { case PLUGIN_VIDEO_DECODER: decoder_info = (decoder_info_t *)node->info->special_info; - free (decoder_info->supported_types); + free ((void *)decoder_info->supported_types); default: free ((void *)node->info->special_info); @@ -2788,7 +2788,7 @@ static void dispose_plugin_list (xine_sarray_t *list, int is_cache) { } /* free info structure and string copies */ - free (node->info->id); + free ((void *)node->info->id); free (node->info); /* don't free the entry list if the node is cache */ -- cgit v1.2.3 From c4888045440dadbd2e861b7cf3dae6065e895385 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 10 Jan 2012 21:42:04 +0000 Subject: And the other two similar printf()s. --- src/video_out/video_out_xcbxv.c | 4 ++-- src/video_out/video_out_xxmc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index a07864e8e..3019898b3 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -1218,8 +1218,8 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis if (xv_port != 0) { if (! xv_open_port(this, xv_port)) { xprintf(class->xine, XINE_VERBOSITY_NONE, - _("%s: could not open Xv port %d - autodetecting\n"), - LOG_MODULE, xv_port); + _("%s: could not open Xv port %lu - autodetecting\n"), + LOG_MODULE, (unsigned long)xv_port); adaptor_it = adaptor_first; xv_port = xv_autodetect_port (this, &adaptor_it, xv_port, prefer_type); } else diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index e35ce5f12..14fcbce97 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -2494,8 +2494,8 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi if (xv_port != 0) { if (! xxmc_open_port(this, xv_port)) { xprintf(class->xine, XINE_VERBOSITY_NONE, - _("%s: could not open Xv port %d - autodetecting\n"), - LOG_MODULE, xv_port); + _("%s: could not open Xv port %lu - autodetecting\n"), + LOG_MODULE, (unsigned long)xv_port); xv_port = xxmc_autodetect_port(this, adaptors, adaptor_info, &adaptor_num, xv_port, prefer_type); } else adaptor_num = xxmc_find_adaptor_by_port (xv_port, adaptors, adaptor_info); -- cgit v1.2.3 From 2bd30e9ad4347436b913bee5df07eabe47b98c6a Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Wed, 11 Jan 2012 15:01:56 +0200 Subject: Fixed id3v2 tag check (broken in r9654) --- src/demuxers/demux_mpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c index 2988c9c19..6658e82bc 100644 --- a/src/demuxers/demux_mpc.c +++ b/src/demuxers/demux_mpc.c @@ -90,7 +90,7 @@ static int open_mpc_file(demux_mpc_t *this) { /* TODO: non-seeking version */ if (INPUT_IS_SEEKABLE(this->input)) { /* Check for id3v2 tag */ - if (id3v2_istag(this->header)) { + if (id3v2_istag(_X_BE_32(this->header))) { lprintf("found id3v2 header\n"); -- cgit v1.2.3 From de4365a21c9b74ae49df8b90097b41cf43616bfd Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Wed, 11 Jan 2012 15:08:05 +0200 Subject: Fixed using uninitialized value (return random size) --- src/xine-engine/xine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index d3a75623b..2a67d89b5 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -2026,7 +2026,7 @@ static int _x_get_current_frame_data (xine_stream_t *stream, int flags, int img_size_unknown) { vo_frame_t *frame; - size_t required_size; + size_t required_size = 0; stream->xine->port_ticket->acquire(stream->xine->port_ticket, 0); frame = stream->video_out->get_last_frame (stream->video_out); -- cgit v1.2.3 From 1e858fff7528ea81d13b0cf718222e737299a607 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Wed, 11 Jan 2012 15:19:24 +0200 Subject: Fixed #include --- src/libspudvb/xine_spudvb_decoder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/libspudvb/xine_spudvb_decoder.c b/src/libspudvb/xine_spudvb_decoder.c index 8d581a23e..1ab52b7e7 100644 --- a/src/libspudvb/xine_spudvb_decoder.c +++ b/src/libspudvb/xine_spudvb_decoder.c @@ -25,8 +25,9 @@ * - Implement support for teletext based subtitles */ -#include "pthread.h" +#include #include + #include "xine_internal.h" #include "bswap.h" #include "osd.h" -- cgit v1.2.3 From 27796b7dd43b9ca776d8d907a42c7a464e30098f Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Wed, 11 Jan 2012 15:22:13 +0200 Subject: Fixed pointer casts * * * Fixed pointer cast --- src/post/audio/stretch.c | 2 +- src/post/audio/upmix_mono.c | 2 +- src/post/deinterlace/xine_plugin.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c index f8047e183..e315b11a8 100644 --- a/src/post/audio/stretch.c +++ b/src/post/audio/stretch.c @@ -643,7 +643,7 @@ static post_plugin_t *stretch_open_plugin(post_class_t *class_gen, int inputs, pthread_mutex_init (&this->lock, NULL); - set_parameters ((xine_post_t *)&this->post, &init_params); + set_parameters (&this->post.xine_post, &init_params); port = _x_post_intercept_audio_port(&this->post, audio_target[0], &input, &output); port->new_port.open = stretch_port_open; diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c index 43fe3df0d..1e5e05549 100644 --- a/src/post/audio/upmix_mono.c +++ b/src/post/audio/upmix_mono.c @@ -315,7 +315,7 @@ static post_plugin_t *upmix_mono_open_plugin(post_class_t *class_gen, int inputs pthread_mutex_init (&this->lock, NULL); - set_parameters ((xine_post_t *)&this->post, &init_params); + set_parameters (&this->post.xine_post, &init_params); port = _x_post_intercept_audio_port(&this->post, audio_target[0], &input, &output); port->new_port.open = upmix_mono_port_open; diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c index 63270acd7..1ea9e9f53 100644 --- a/src/post/deinterlace/xine_plugin.c +++ b/src/post/deinterlace/xine_plugin.c @@ -397,7 +397,7 @@ static post_plugin_t *deinterlace_open_plugin(post_class_t *class_gen, int input pthread_mutex_init (&this->lock, NULL); - set_parameters ((xine_post_t *)&this->post, &class->init_param); + set_parameters (&this->post.xine_post, &class->init_param); port = _x_post_intercept_video_port(&this->post, video_target[0], &input, &output); /* replace with our own get_frame function */ -- cgit v1.2.3 From be17259906a90ce5f6338e56d397cb99be4b3cbc Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Thu, 12 Jan 2012 14:29:45 +0200 Subject: Fixed leak --- src/post/deinterlace/xine_plugin.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c index 1ea9e9f53..c9d451b4f 100644 --- a/src/post/deinterlace/xine_plugin.c +++ b/src/post/deinterlace/xine_plugin.c @@ -449,6 +449,7 @@ static void deinterlace_dispose(post_plugin_t *this_gen) if (_x_post_dispose(this_gen)) { _flush_frames(this); pthread_mutex_destroy(&this->lock); + free(this->tvtime); free(this); } } -- cgit v1.2.3 From 9c673be406d023c46e816a0a89bf8171a5be7e79 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Thu, 12 Jan 2012 14:50:21 +0200 Subject: Fixed pointer cast --- src/video_out/video_out_xvmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index f06f0cf3f..aeb50271a 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.c @@ -790,7 +790,7 @@ static void xvmc_update_frame_format (vo_driver_t *this_gen, frame->ratio = ratio; } - xvmc->macroblocks = (xine_macroblocks_t *)&this->macroblocks; + xvmc->macroblocks = &this->macroblocks.xine_mc; this->macroblocks.num_blocks = 0; this->macroblocks.macroblockptr = this->macroblocks.macroblockbaseptr; this->macroblocks.xine_mc.blockptr = -- cgit v1.2.3 From 2f4591b336883490ee3d14ad397de91f98fe376e Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Thu, 12 Jan 2012 14:54:08 +0200 Subject: Fixed pointer type --- src/video_out/video_out_fb.c | 2 +- src/video_out/video_out_raw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index c8697694e..aa066c9c7 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -92,7 +92,7 @@ typedef struct fb_frame_s vo_scale_t sc; - uint8_t *chunk[3]; /* mem alloc by xmalloc_aligned */ + void *chunk[3]; /* mem alloc by xmalloc_aligned */ yuv2rgb_t *yuv2rgb; /* yuv2rgb converter for this frame */ uint8_t *rgb_dst; diff --git a/src/video_out/video_out_raw.c b/src/video_out/video_out_raw.c index 860efdfb7..456b3392f 100644 --- a/src/video_out/video_out_raw.c +++ b/src/video_out/video_out_raw.c @@ -61,7 +61,7 @@ typedef struct { int width, height, format, flags; double ratio; - uint8_t *chunk[4]; /* mem alloc by xmalloc_aligned */ + void *chunk[4]; /* mem alloc by xmalloc_aligned */ uint8_t *rgb, *rgb_dst; yuv2rgb_t *yuv2rgb; /* yuv2rgb converter set up for this frame */ -- cgit v1.2.3 From 2aecfe0bda20fe9ca4bfccd3034ad8655a3c81c4 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Thu, 12 Jan 2012 14:56:02 +0200 Subject: Hide "warning: cast from pointer to integer of different size" --- src/video_out/video_out_xcbshm.c | 2 +- src/video_out/video_out_xcbxv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index c93cf8c1e..e3556d8e7 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -870,7 +870,7 @@ static int xshm_gui_data_exchange (vo_driver_t *this_gen, break; case XINE_GUI_SEND_DRAWABLE_CHANGED: - this->window = (xcb_window_t) data; + this->window = (xcb_window_t) (long) data; pthread_mutex_lock(&this->main_mutex); xcb_free_gc(this->connection, this->gc); diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index 78bbc94e6..15cb986d7 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -968,7 +968,7 @@ static int xv_gui_data_exchange (vo_driver_t *this_gen, case XINE_GUI_SEND_DRAWABLE_CHANGED: pthread_mutex_lock(&this->main_mutex); - this->window = (xcb_window_t) data; + this->window = (xcb_window_t) (long) data; xcb_free_gc(this->connection, this->gc); this->gc = xcb_generate_id(this->connection); xcb_create_gc(this->connection, this->gc, this->window, 0, NULL); -- cgit v1.2.3 From c183aac00525f9b15efb7a20bf984af68e40d87a Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Thu, 12 Jan 2012 14:57:17 +0200 Subject: Added const --- src/demuxers/demux_real.c | 2 +- src/video_out/video_out_opengl.c | 8 ++++---- src/video_out/video_out_xcbxv.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 19b7794ef..2b14a4207 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -546,7 +546,7 @@ static void real_parse_headers (demux_real_t *this) { lprintf("audio version %d detected\n", version); - char *fourcc_ptr = "\0\0\0"; + const char *fourcc_ptr = "\0\0\0"; switch(version) { case 3: /* Version 3 header stores fourcc after meta info - cheat by reading backwards from the diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 751e39991..3f3000523 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -224,7 +224,7 @@ typedef void *(*thread_run_t)(void *); typedef struct { /* Name of render backend */ - char *name; + const char * const name; /* Finally display current image (needed for Redraw) */ void (*display)(opengl_driver_t *, opengl_frame_t *); /* Upload new image; Returns 0 if failed */ @@ -673,7 +673,7 @@ static int render_image_envtex (opengl_driver_t *this, opengl_frame_t *frame) { /* * Render setup functions */ -static int render_help_verify_ext (opengl_driver_t *this, char *ext) { +static int render_help_verify_ext (opengl_driver_t *this, const char *ext) { int ret = 0; const size_t l = strlen (ext); const char *e; @@ -924,7 +924,7 @@ static int render_setup_torus (opengl_driver_t *this) { static int render_setup_fp_yuv (opengl_driver_t *this) { GLint errorpos; int ret; - static char *fragprog_yuv = + static const char *fragprog_yuv = "!!ARBfp1.0\n" "ATTRIB tex = fragment.texcoord[0];" "PARAM off = program.env[0];" @@ -1821,7 +1821,7 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v config_values_t *config = class->xine->config; x11_visual_t *visual = (x11_visual_t *) visual_gen; opengl_driver_t *this; - char **render_fun_names; + const char **render_fun_names; int i; this = (opengl_driver_t *) calloc(1, sizeof(opengl_driver_t)); diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index 15cb986d7..1f580bd69 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -1130,9 +1130,9 @@ static int xv_check_yv12(xcb_connection_t *connection, xcb_xv_port_t port) { static void xv_check_capability (xv_driver_t *this, int property, xcb_xv_attribute_info_t *attr, int base_id, - char *config_name, - char *config_desc, - char *config_help) { + const char *config_name, + const char *config_desc, + const char *config_help) { int int_default; cfg_entry_t *entry; const char *str_prop = xcb_xv_attribute_info_name(attr); -- cgit v1.2.3 From 0629f44713df6cab71e5a648b25a831016635a09 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 16 Jan 2012 21:57:28 +0200 Subject: Check for failed write --- src/audio_out/audio_file_out.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c index 802461e0e..bc40d4efd 100644 --- a/src/audio_out/audio_file_out.c +++ b/src/audio_out/audio_file_out.c @@ -274,10 +274,20 @@ static void ao_file_close(ao_driver_t *this_gen) this->fname, this->bytes_written / 1024); if (lseek(this->fd, 40, SEEK_SET) != -1) { - write(this->fd, &len, 4); + if (write(this->fd, &len, 4) != 4) { + xprintf (this->xine, XINE_VERBOSITY_LOG, "audio_file_out: Failed to write header to file '%s': %s\n", + this->fname, strerror(errno)); + } + len = le2me_32(this->bytes_written + 0x24); - if (lseek(this->fd, 4, SEEK_SET) != -1) - write(this->fd, &len, 4); + if (lseek(this->fd, 4, SEEK_SET) != -1) { + if (write(this->fd, &len, 4) != 4) { + xprintf (this->xine, XINE_VERBOSITY_LOG, + "audio_file_out: Failed to write header to file '%s': %s\n", + this->fname, strerror(errno)); + } + } + } close(this->fd); -- cgit v1.2.3 From 936513edb97e36546901a26b14dfc772f2dea079 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 16 Jan 2012 21:59:23 +0200 Subject: Removed write-only variables and unused code --- src/audio_out/audio_jack_out.c | 5 ++--- src/audio_out/audio_pulse_out.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c index a343310f0..1fadb3a13 100644 --- a/src/audio_out/audio_jack_out.c +++ b/src/audio_out/audio_jack_out.c @@ -278,12 +278,13 @@ static int jack_callback (jack_nframes_t nframes, void *arg) return 0; } - +#if 0 static void jack_shutdown (void *arg) { jack_driver_t *this = (jack_driver_t *) arg; this->client = NULL; } +#endif /* * Open the Jack audio device @@ -295,7 +296,6 @@ static int jack_open_device (ao_driver_t *this_gen, char *jack_device, { jack_driver_t *this = (jack_driver_t *) this_gen; const char **matching_ports = NULL; - char *port_name = NULL; jack_client_t *client = this->client; int port_flags = JackPortIsInput; @@ -686,7 +686,6 @@ static ao_driver_t *open_jack_plugin (audio_driver_class_t *class_gen, uint32_t rate; char *jack_device; const char **matching_ports = NULL; - const char **port_names; /* for usability reasons, keep this in sync with audio_oss_out.c */ static char *speaker_arrangement[] = { diff --git a/src/audio_out/audio_pulse_out.c b/src/audio_out/audio_pulse_out.c index ae74a57bc..93e134785 100644 --- a/src/audio_out/audio_pulse_out.c +++ b/src/audio_out/audio_pulse_out.c @@ -360,7 +360,6 @@ static int ao_pulse_open(ao_driver_t *this_gen, pulse_driver_t *this = (pulse_driver_t *) this_gen; pa_sample_spec ss; pa_channel_map cm; - int r; xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_pulse_out: ao_open bits=%d rate=%d, mode=%d\n", bits, rate, mode); @@ -466,7 +465,7 @@ static int ao_pulse_open(ao_driver_t *this_gen, pa_stream_set_write_callback(this->stream, __xine_pa_stream_request_callback, this); pa_stream_set_latency_update_callback(this->stream, __xine_pa_stream_notify_callback, this); - r = pa_stream_connect_playback(this->stream, this->sink, NULL, + pa_stream_connect_playback(this->stream, this->sink, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL); -- cgit v1.2.3 From aeaf51a776230b6f6aacdd2ac161a6c757fb1659 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 16 Jan 2012 22:20:31 +0200 Subject: Copy to buf->content --- src/demuxers/demux_real.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 2b14a4207..9ecf6b622 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -1251,7 +1251,7 @@ static int demux_real_send_chunk(demux_plugin_t *this_gen) { buf->size = 0; buf->type = this->video_stream->buf_type; - xine_fast_memcpy(buf->decoder_info_ptr[2], this->fragment_tab, + xine_fast_memcpy(buf->content, this->fragment_tab, this->fragment_count*8); this->video_fifo->put(this->video_fifo, buf); -- cgit v1.2.3 From 58b3adb59516838ebc83c1690bfb03b0b0f88704 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 16 Jan 2012 22:21:37 +0200 Subject: Removed unused variables and code --- src/demuxers/demux_asf.c | 18 +++++++++++++----- src/demuxers/demux_avi.c | 4 ---- src/demuxers/demux_iff.c | 2 -- src/demuxers/demux_matroska.c | 6 ++---- src/demuxers/demux_mpeg_block.c | 4 ++++ src/demuxers/demux_mpeg_pes.c | 5 ++++- src/demuxers/demux_ogg.c | 31 ++++++++++++++++++++++--------- src/demuxers/demux_wc3movie.c | 3 +-- 8 files changed, 46 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 1250ba9a5..d2f0a89de 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -513,13 +513,13 @@ static int asf_read_header (demux_asf_t *this) { * XX bytes : optional palette */ uint32_t width, height; - uint16_t bmiheader_size; + /*uint16_t bmiheader_size;*/ xine_bmiheader *bmiheader; width = _X_LE_32(asf_stream->private_data); height = _X_LE_32(asf_stream->private_data + 4); /* there is one unknown byte between height and the bmiheader size */ - bmiheader_size = _X_LE_16(asf_stream->private_data + 9); + /*bmiheader_size = _X_LE_16(asf_stream->private_data + 9);*/ /* FIXME: bmiheader_size must be >= sizeof(xine_bmiheader) */ @@ -998,8 +998,10 @@ static int asf_parse_packet_ecd(demux_asf_t *this, uint32_t *p_hdr_size) { /* return 0 if ok */ static int asf_parse_packet_payload_header(demux_asf_t *this, uint32_t p_hdr_size) { +#ifdef LOG int64_t timestamp; int64_t duration; +#endif this->packet_len_flags = get_byte(this); p_hdr_size += 1; this->packet_prop_flags = get_byte(this); p_hdr_size += 1; @@ -1038,8 +1040,10 @@ static int asf_parse_packet_payload_header(demux_asf_t *this, uint32_t p_hdr_siz this->packet_padsize = 0; } +#ifdef LOG timestamp = get_le32(this); p_hdr_size += 4; duration = get_le16(this); p_hdr_size += 2; +#endif lprintf ("timestamp=%"PRId64", duration=%"PRId64"\n", timestamp, duration); @@ -1581,11 +1585,11 @@ static int demux_asf_parse_asx_references( demux_asf_t *this) { ENTRYREF, MOREINFO, PARAM, REPEAT, TITLE */ - const char *base_href = NULL; + /*const char *base_href = NULL;*/ for (asx_entry = xml_tree->child; asx_entry; asx_entry = asx_entry->next) { - const char *ref_base_href = base_href; + /*const char *ref_base_href = base_href;*/ if (!strcasecmp (asx_entry->name, "ENTRY")) { @@ -1641,9 +1645,11 @@ static int demux_asf_parse_asx_references( demux_asf_t *this) { duration = asx_get_time_value (asx_ref); } +#if 0 else if (!strcasecmp (asx_ref->name, "BASE")) /* Attributes: HREF */ - ref_base_href = xml_parser_get_property (asx_entry, "HREF"); + ref_base_href = xml_parser_get_property (asx_entry, "HREF"); +#endif } /* FIXME: prepend ref_base_href to href */ @@ -1661,9 +1667,11 @@ static int demux_asf_parse_asx_references( demux_asf_t *this) { _x_demux_send_mrl_reference (this->stream, 0, href, NULL, 0, -1); } +#if 0 else if (!strcasecmp (asx_entry->name, "BASE")) /* Attributes: HREF */ base_href = xml_parser_get_property (asx_entry, "HREF"); +#endif } } else diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 100828bd2..f4c9357fa 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -732,8 +732,6 @@ static avi_t *XINE_MALLOC AVI_init(demux_avi_t *this) { int lasttag = 0; int vids_strh_seen = 0; int vids_strf_seen = 0; - int auds_strh_seen = 0; - int auds_strf_seen = 0; int num_stream = 0; uint8_t data[256]; int strf_size; @@ -898,7 +896,6 @@ static avi_t *XINE_MALLOC AVI_init(demux_avi_t *this) { a->dwSampleSize = _X_LE_32(hdrl_data + i + 44); a->audio_tot = 0; - auds_strh_seen = 1; lprintf("audio stream header, num_stream=%d\n", num_stream); lasttag = 2; /* auds */ @@ -985,7 +982,6 @@ static avi_t *XINE_MALLOC AVI_init(demux_avi_t *this) { AVI->audio[AVI->n_audio-1]->wavex = wavex; AVI->audio[AVI->n_audio-1]->wavex_len = n; lprintf("audio stream format\n"); - auds_strf_seen = 1; } } else if(strncasecmp(hdrl_data + i, "indx",4) == 0) { diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c index 1785e86d7..fb7d1c748 100644 --- a/src/demuxers/demux_iff.c +++ b/src/demuxers/demux_iff.c @@ -689,7 +689,6 @@ static int demux_iff_send_chunk(demux_plugin_t *this_gen) { int64_t zw_pts; int64_t zw_rescale; int j, k; - int first_buf; int interleave_index; int size; @@ -791,7 +790,6 @@ static int demux_iff_send_chunk(demux_plugin_t *this_gen) { interleave_index = (current_file_pos * this->audio_compression_factor); } - first_buf = 1; zw_pts = current_file_pos; diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 3d1935587..deef0b3b6 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -1846,7 +1846,7 @@ static int parse_block (demux_matroska_t *this, size_t block_size, uint64_t track_num; uint8_t *data; uint8_t flags; - int gap, lacing, num_len; + int lacing, num_len; int16_t timecode_diff; int64_t pts, xduration; int decoder_flags = 0; @@ -1866,7 +1866,7 @@ static int parse_block (demux_matroska_t *this, size_t block_size, lprintf("track_num: %" PRIu64 ", timecode_diff: %d, flags: 0x%x\n", track_num, timecode_diff, flags); - gap = flags & 1; + /*gap = flags & 1;*/ lacing = (flags >> 1) & 0x3; /*fprintf(stderr, "lacing: %x\n", lacing);*/ @@ -2070,7 +2070,6 @@ static int parse_block (demux_matroska_t *this, size_t block_size, static int parse_simpleblock(demux_matroska_t *this, size_t block_len, uint64_t cluster_timecode, uint64_t block_duration) { - int has_block = 0; off_t block_pos = 0; off_t file_len = 0; int normpos = 0; @@ -2085,7 +2084,6 @@ static int parse_simpleblock(demux_matroska_t *this, size_t block_len, uint64_t if (!read_block_data(this, block_len, this->compress_maxlen)) return 0; - has_block = 1; /* we have the duration, we can parse the block now */ if (!parse_block(this, block_len, cluster_timecode, block_duration, normpos, is_key)) diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index aa5294e8b..08655ada9 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -868,6 +868,7 @@ static int32_t parse_private_stream_1(demux_mpeg_block_t *this, uint8_t *p, buf_ } else if ((p[0]&0xf0) == 0xa0) { int pcm_offset; +#if 0 int number_of_frame_headers; int first_access_unit_pointer; int audio_frame_number; @@ -875,6 +876,7 @@ static int32_t parse_private_stream_1(demux_mpeg_block_t *this, uint8_t *p, buf_ int sample_rate; int num_channels; int dynamic_range; +#endif /* * found in http://members.freemail.absa.co.za/ginggs/dvd/mpeg2_lpcm.txt @@ -882,6 +884,7 @@ static int32_t parse_private_stream_1(demux_mpeg_block_t *this, uint8_t *p, buf_ */ track = p[0] & 0x0F; +#if 0 number_of_frame_headers = p[1]; /* unknown = p[2]; */ first_access_unit_pointer = p[3]; @@ -906,6 +909,7 @@ static int32_t parse_private_stream_1(demux_mpeg_block_t *this, uint8_t *p, buf_ case 2: bits_per_sample = 24; break; } dynamic_range = p[6]; +#endif /* send lpcm config byte */ buf->decoder_flags |= BUF_FLAG_SPECIAL; diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 9ef7221f0..305069b3c 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -975,6 +975,7 @@ static int32_t parse_private_stream_1(demux_mpeg_pes_t *this, uint8_t *p, buf_el } else if ((p[0]&0xf0) == 0xa0) { int pcm_offset; +#if 0 int number_of_frame_headers; int first_access_unit_pointer; int audio_frame_number; @@ -982,13 +983,14 @@ static int32_t parse_private_stream_1(demux_mpeg_pes_t *this, uint8_t *p, buf_el int sample_rate; int num_channels; int dynamic_range; - +#endif /* * found in http://members.freemail.absa.co.za/ginggs/dvd/mpeg2_lpcm.txt * appears to be correct. */ track = p[0] & 0x0F; +#if 0 number_of_frame_headers = p[1]; /* unknown = p[2]; */ first_access_unit_pointer = p[3]; @@ -1019,6 +1021,7 @@ static int32_t parse_private_stream_1(demux_mpeg_pes_t *this, uint8_t *p, buf_el case 2: bits_per_sample = 24; break; } dynamic_range = p[6]; +#endif /* send lpcm config byte */ buf->decoder_flags |= BUF_FLAG_SPECIAL; diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index e0abd0cd6..8849e445e 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -931,21 +931,27 @@ static void decode_video_header (demux_ogg_t *this, const int stream_num, ogg_pa xine_bmiheader bih; int channel; +#ifdef LOG int16_t locbits_per_sample; + int32_t locsize, locdefault_len, locbuffersize; + int64_t locsamples_per_unit; +#endif uint32_t locsubtype; - int32_t locsize, locdefault_len, locbuffersize, locwidth, locheight; - int64_t loctime_unit, locsamples_per_unit; + int32_t locwidth, locheight; + int64_t loctime_unit; /* read fourcc with machine endianness */ locsubtype = *((uint32_t *)&op->packet[9]); /* everything else little endian */ - locsize = _X_LE_32(&op->packet[13]); loctime_unit = _X_LE_64(&op->packet[17]); +#ifdef LOG + locsize = _X_LE_32(&op->packet[13]); locsamples_per_unit = _X_LE_64(&op->packet[25]); locdefault_len = _X_LE_32(&op->packet[33]); locbuffersize = _X_LE_32(&op->packet[37]); locbits_per_sample = _X_LE_16(&op->packet[41]); +#endif locwidth = _X_LE_32(&op->packet[45]); locheight = _X_LE_32(&op->packet[49]); @@ -1014,18 +1020,25 @@ static void decode_audio_header (demux_ogg_t *this, const int stream_num, ogg_pa char str[5]; int channel; - int16_t locbits_per_sample, locchannels, locblockalign; - int32_t locsize, locdefault_len, locbuffersize, locavgbytespersec; - int64_t loctime_unit, locsamples_per_unit; +#ifdef LOG + int16_t locblockalign; + int32_t locsize, locdefault_len, locbuffersize; + int64_t loctime_unit; +#endif + int16_t locbits_per_sample, locchannels; + int32_t locavgbytespersec; + int64_t locsamples_per_unit; +#ifdef LOG locsize = _X_LE_32(&op->packet[13]); loctime_unit = _X_LE_64(&op->packet[17]); - locsamples_per_unit = _X_LE_64(&op->packet[25]); - locdefault_len = _X_LE_32(&op->packet[33]); locbuffersize = _X_LE_32(&op->packet[37]); + locdefault_len = _X_LE_32(&op->packet[33]); + locblockalign = _X_LE_16(&op->packet[47]); +#endif + locsamples_per_unit = _X_LE_64(&op->packet[25]); locbits_per_sample = _X_LE_16(&op->packet[41]); locchannels = _X_LE_16(&op->packet[45]); - locblockalign = _X_LE_16(&op->packet[47]); locavgbytespersec= _X_LE_32(&op->packet[49]); lprintf ("direct show filter created audio stream detected, hexdump:\n"); diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index 36cc4eabb..3b310e90c 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -141,7 +141,6 @@ static int demux_mve_send_chunk(demux_plugin_t *this_gen) { demux_mve_t *this = (demux_mve_t *) this_gen; buf_element_t *buf = NULL; - int64_t text_pts = 0; int64_t audio_pts = 0; unsigned char preamble[PREAMBLE_SIZE]; unsigned int chunk_tag; @@ -264,7 +263,7 @@ static int demux_mve_send_chunk(demux_plugin_t *this_gen) { } this->video_pts += WC3_PTS_INC; } else if (chunk_tag == TEXT_TAG) { - text_pts = this->video_pts - WC3_PTS_INC; + /*text_pts = this->video_pts - WC3_PTS_INC;*/ /* unhandled thus far */ this->input->seek(this->input, chunk_size, SEEK_CUR); -- cgit v1.2.3 From 48c8cc338c561352e531cd8ccdbfe8b19b281473 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 16 Jan 2012 22:31:41 +0200 Subject: Fixed using uninitialized data --HG-- branch : point-release --- src/demuxers/demux_avi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 100828bd2..02c242137 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -1712,7 +1712,7 @@ static int demux_avi_next_streaming (demux_avi_t *this, int decoder_flags) { int64_t audio_pts, video_pts; off_t current_pos; int left; - int header, chunk_len, audio_stream; + int header, chunk_len = 0, audio_stream; avi_audio_t *audio; current_pos = this->input->get_current_pos(this->input); -- cgit v1.2.3 From d09162d992bcda8ee38cb5c0b13557e395876c64 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 16 Jan 2012 22:33:23 +0200 Subject: Fixed matroska header compression when using lacing (ex. multiple audio frames in one block) --HG-- branch : point-release --- src/demuxers/demux_matroska.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src') diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 3d1935587..ff2658a0c 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -2049,6 +2049,13 @@ static int parse_block (demux_matroska_t *this, size_t block_size, } /* send each frame to the decoder */ for (i = 0; i <= lace_num; i++) { + + if (headers_len) { + data -= headers_len; + xine_fast_memcpy(data, track->compress_settings, headers_len); + frame[i] += headers_len; + } + if (track->handle_content != NULL) { track->handle_content((demux_plugin_t *)this, track, decoder_flags, -- cgit v1.2.3 From 3298dcdbed459629be8717d246465a0d145232c1 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 16 Jan 2012 22:38:14 +0200 Subject: Fixed using uninitialized data --HG-- branch : point-release --- src/demuxers/asfheader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/demuxers/asfheader.c b/src/demuxers/asfheader.c index 7a1397d73..5b309b76b 100644 --- a/src/demuxers/asfheader.c +++ b/src/demuxers/asfheader.c @@ -358,7 +358,7 @@ exit_error: static int asf_header_parse_stream_extended_properties(asf_header_t *header, uint8_t *buffer, int buffer_len) { asf_reader_t reader; uint32_t flags = 0; - uint16_t stream_number; + uint16_t stream_number = 0; int i; int stream_id; asf_stream_extension_t *asf_stream_extension; @@ -532,7 +532,7 @@ static int asf_header_parse_metadata(asf_header_t *header_pub, uint8_t *buffer, for (i = 0; i < records_count; i++) { - uint16_t index, stream, name_len = 0, data_type; + uint16_t index, stream = 0, name_len = 0, data_type; uint32_t data_len = 0; int stream_id; -- cgit v1.2.3