Thread: [Mplayerplug-in-cvs] mplayerplug-in/Source plugin-list.cpp,1.39,1.40 plugin-setup.cpp,1.36,1.37
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2004-08-31 17:30:02
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7173/Source Modified Files: plugin-list.cpp plugin-setup.cpp Log Message: Fix for infinite loop in smil file that the seq block contains no audio or video tags. Index: plugin-setup.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** plugin-setup.cpp 29 Aug 2004 17:42:56 -0000 1.36 --- plugin-setup.cpp 31 Aug 2004 17:29:53 -0000 1.37 *************** *** 214,217 **** --- 214,222 ---- "audio/x-realaudio:ra:RealAudio;", sizeof(MimeTypes)); } + + if (enable_real == 0 && enable_qt == 1) { + strlcat(MimeTypes, + "application/smil:smil:SMIL;", sizeof(MimeTypes)); + } if (enable_mpeg == 1) { Index: plugin-list.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-list.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** plugin-list.cpp 16 Jun 2004 22:13:35 -0000 1.39 --- plugin-list.cpp 31 Aug 2004 17:29:53 -0000 1.40 *************** *** 458,466 **** 3); if (videosrc != NULL) { ! videosrc = strchr(videosrc, '\"'); ! if (videosrc == NULL) break; i = (long) videosrc - (long) buffer_lower; sscanf(buffer + i, "\"%1023[^\"]\"", url); if (DEBUG) printf("[smil] found url %s\n", url); --- 458,476 ---- 3); if (videosrc != NULL) { ! if (strchr(videosrc, '\"') == NULL) ! videosrc = strchr(videosrc, '\''); ! else ! videosrc = strchr(videosrc, '\"'); ! ! if (videosrc == NULL) { ! seqtag = (char *)NULL; ! p = NULL; ! videotag = NULL; break; + } i = (long) videosrc - (long) buffer_lower; sscanf(buffer + i, "\"%1023[^\"]\"", url); + if (url == NULL) + sscanf(buffer + i, "\'%1023[^\']\'", url); if (DEBUG) printf("[smil] found url %s\n", url); *************** *** 468,471 **** --- 478,486 ---- addToList(instance, url, parent, speed); found = 1; + } else { + seqtag = (char *)NULL; + p = NULL; + videotag = NULL; + break; } find_area_tags(videosrc, instance->td->list); *************** *** 491,494 **** --- 506,511 ---- } p = (char *) seqtag; + } else { + p = (char *) seqtag + 4; // for the seq block that contains no video or audio tags } } |