diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_mng.c | 7 | ||||
| -rw-r--r-- | src/demuxers/demux_ogg.c | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index f94babc8b..e1afda477 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_mng.c,v 1.17 2003/12/05 15:54:57 f1rmb Exp $ + * $Id: demux_mng.c,v 1.18 2003/12/10 00:54:25 hadess Exp $ * * demux_mng.c, Demuxer plugin for Multiple-image Network Graphics format * @@ -28,6 +28,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" +#undef HAVE_CONFIG_H #endif #include <stdio.h> @@ -35,6 +36,10 @@ #include <fcntl.h> #include <unistd.h> +#ifdef HAVE_STDLIB_H +#undef HAVE_STDLIB_H +#endif + #include <libmng.h> #define LOG_MODULE "demux_mng" diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index fd68d0a89..59d410b9c 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_ogg.c,v 1.123 2003/12/09 23:55:11 hadess Exp $ + * $Id: demux_ogg.c,v 1.124 2003/12/10 00:54:26 hadess Exp $ * * demultiplexer for ogg streams * @@ -1585,10 +1585,11 @@ static int demux_ogg_get_optional_data(demux_plugin_t *this_gen, for (stream_num=0; stream_num<this->num_streams; stream_num++) { if (this->buf_types[stream_num]==BUF_SPU_OGM+channel) { if (this->language[stream_num]) { - strncpy (str, this->language[stream_num], XINE_LANG_LABEL_MAX_SIZE); + strncpy (str, this->language[stream_num], XINE_LANG_MAX); + str[XINE_LANG_MAX - 1] = '\0'; return DEMUX_OPTIONAL_SUCCESS; } else { - snprintf(str, XINE_LANG_LABEL_MAX_SIZE, "channel %d",channel); + snprintf(str, XINE_LANG_MAX, "channel %d",channel); return DEMUX_OPTIONAL_SUCCESS; } } @@ -1604,10 +1605,11 @@ static int demux_ogg_get_optional_data(demux_plugin_t *this_gen, for (stream_num=0; stream_num<this->num_streams; stream_num++) { if ((this->buf_types[stream_num]&0xFF00001F)==BUF_AUDIO_BASE+channel) { if (this->language[stream_num]) { - strncpy (str, this->language[stream_num], XINE_LANG_LABEL_MAX_SIZE); + strncpy (str, this->language[stream_num], XINE_LANG_MAX); + str[XINE_LANG_MAX - 1] = '\0'; return DEMUX_OPTIONAL_SUCCESS; } else { - snprintf(str, XINE_LANG_LABEL_MAX_SIZE, "channel %d",channel); + snprintf(str, XINE_LANG_MAX, "channel %d",channel); return DEMUX_OPTIONAL_SUCCESS; } } |