diff options
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_slave.c | 4 | ||||
| -rw-r--r-- | src/demuxers/id3.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index ffad53107..8aa7399e4 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -21,7 +21,7 @@ */ /* - * $Id: demux_slave.c,v 1.17 2006/03/11 08:55:10 tmattern Exp $ + * $Id: demux_slave.c,v 1.18 2006/04/05 22:12:18 valtri Exp $ * * demuxer for slave "protocol" * master xine must be started with XINE_PARAM_BROADCASTER_PORT set, that is, @@ -303,7 +303,7 @@ static void demux_slave_dispose (demux_plugin_t *this_gen) { xine_list_iterator_t ite; /* free all decoder information */ - while (ite = xine_list_front(this->dec_infos)) { + while ((ite = xine_list_front(this->dec_infos)) != NULL) { data = xine_list_get_value(this->dec_infos, ite); free(data); xine_list_remove (this->dec_infos, ite); diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c index 29cb3d4c4..ffa022a59 100644 --- a/src/demuxers/id3.c +++ b/src/demuxers/id3.c @@ -29,7 +29,7 @@ * * ID3v2 specs: http://www.id3.org/ * - * $Id: id3.c,v 1.11 2005/09/16 23:01:10 tmattern Exp $ + * $Id: id3.c,v 1.12 2006/04/05 22:12:18 valtri Exp $ */ #ifdef HAVE_CONFIG_H @@ -227,11 +227,13 @@ static int id3v2_parse_genre(char* dest, char *src, int len) { return 1; } +#if 0 /* parse an unsynchronized 16bits integer */ static uint16_t BE_16_synchsafe(uint8_t buf[2]) { return ((uint16_t)(buf[0] & 0x7F) << 7) | (uint16_t)(buf[1] & 0x7F); } +#endif /* parse an unsynchronized 24bits integer */ static uint32_t BE_24_synchsafe(uint8_t buf[3]) { |