diff options
Diffstat (limited to 'src/input/mmsh.c')
| -rw-r--r-- | src/input/mmsh.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/input/mmsh.c b/src/input/mmsh.c index 30c16001d..3a33e8d7f 100644 --- a/src/input/mmsh.c +++ b/src/input/mmsh.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: mmsh.c,v 1.42 2007/01/11 16:20:55 klan Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * MMS over HTTP protocol * written by Thibaut Mattern @@ -53,8 +51,8 @@ /* #define LOG */ -#include "xine_internal.h" -#include "xineutils.h" +#include <xine/xine_internal.h> +#include <xine/xineutils.h> #include "bswap.h" #include "http_helper.h" @@ -316,8 +314,8 @@ static int get_chunk_header (mmsh_t *this) { "libmmsh: chunk header read failed, %d != %d\n", read_len, CHUNK_HEADER_LENGTH); return 0; } - this->chunk_type = LE_16 (&chunk_header[0]); - this->chunk_length = LE_16 (&chunk_header[2]); + this->chunk_type = _X_LE_16 (&chunk_header[0]); + this->chunk_length = _X_LE_16 (&chunk_header[2]); switch (this->chunk_type) { case CHUNK_TYPE_DATA: @@ -347,16 +345,16 @@ static int get_chunk_header (mmsh_t *this) { switch (this->chunk_type) { case CHUNK_TYPE_DATA: - this->chunk_seq_number = LE_32 (&ext_header[0]); + this->chunk_seq_number = _X_LE_32 (&ext_header[0]); lprintf ("chunk type: CHUNK_TYPE_DATA\n"); lprintf ("chunk length: %d\n", this->chunk_length); lprintf ("chunk seq: %d\n", this->chunk_seq_number); lprintf ("unknown: %d\n", ext_header[4]); lprintf ("mmsh seq: %d\n", ext_header[5]); - lprintf ("len2: %d\n", LE_16(&ext_header[6])); + lprintf ("len2: %d\n", _X_LE_16(&ext_header[6])); break; case CHUNK_TYPE_END: - this->chunk_seq_number = LE_32 (&ext_header[0]); + this->chunk_seq_number = _X_LE_32 (&ext_header[0]); lprintf ("chunk type: CHUNK_TYPE_END\n"); lprintf ("continue: %d\n", this->chunk_seq_number); break; @@ -366,7 +364,7 @@ static int get_chunk_header (mmsh_t *this) { lprintf ("unknown: %2X %2X %2X %2X %2X %2X\n", ext_header[0], ext_header[1], ext_header[2], ext_header[3], ext_header[4], ext_header[5]); - lprintf ("len2: %d\n", LE_16(&ext_header[6])); + lprintf ("len2: %d\n", _X_LE_16(&ext_header[6])); break; case CHUNK_TYPE_RESET: lprintf ("chunk type: CHUNK_TYPE_RESET\n"); @@ -449,7 +447,7 @@ static int interp_header (mmsh_t *this) { return 1; } -static const char *const mmsh_proto_s[] = { "mms", "mmsh", NULL }; +static const char mmsh_proto_s[][8] = { "mms", "mmsh", "" }; static int mmsh_valid_proto (char *proto) { int i = 0; @@ -459,7 +457,7 @@ static int mmsh_valid_proto (char *proto) { if (!proto) return 0; - while(mmsh_proto_s[i]) { + while(*(mmsh_proto_s[i])) { if (!strcasecmp(proto, mmsh_proto_s[i])) { return 1; } |