summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-07 20:37:09 +0000
committerbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-07 20:37:09 +0000
commit488c6ad71050ad905991dd70647a1d082375a8ed (patch)
tree3236faeeed19f9f5e90e7229923f18035f1c8d5b
parent3e3af1af58856e28361b23073b098a38226a34b0 (diff)
downloadmpv-488c6ad71050ad905991dd70647a1d082375a8ed.tar.bz2
mpv-488c6ad71050ad905991dd70647a1d082375a8ed.tar.xz
Fixed an unknown command. Looks like it's a new command from WMS9.
Changed all the exit by return -1 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7310 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/asf_mmst_streaming.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/libmpdemux/asf_mmst_streaming.c b/libmpdemux/asf_mmst_streaming.c
index dc0a94df91..05468a740b 100644
--- a/libmpdemux/asf_mmst_streaming.c
+++ b/libmpdemux/asf_mmst_streaming.c
@@ -413,7 +413,7 @@ while(CheckOuterData)
if ( (pre_header[7] != 0xb0) || (pre_header[6] != 0x0b) || (pre_header[5] != 0xfa) || (pre_header[4] != 0xce) )
{
printf ("missing signature\n");
- exit (1);
+ return -1;
}
command = get_32 (data, 24) & 0xFFFF;
@@ -426,10 +426,16 @@ while(CheckOuterData)
printf ("everything done. Thank you for downloading a media file containing proprietary and patentend technology.\n");
return 0;
}
+ else if (command == 0x21 )
+ {
+ // Looks like it's new in WMS9
+ // Unknown command, but ignoring it seems to work.
+ return 0;
+ }
else if (command != 0x05)
{
printf ("unknown command %02x\n", command);
- exit (1);
+ return -1;
}
}
}
@@ -482,7 +488,8 @@ asf_mmst_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *strea
if( ret<0 ) {
- printf("nop_streaming_read error : %s\n",strerror(errno));
+ printf("get_media_packet error : %s\n",strerror(errno));
+ return -1;
}