[MPlayer-cvslog] r29613 - trunk/mplayer.c

[reimar]

Author: reimar
Date: Tue Sep  1 17:52:13 2009
New Revision: 29613

Log:
Make the loop detection for mov reference files less aggressive, fixes
playback of http://stream.qtv.apple.com/qtv/wgbh/http/nova_eu/nova_eu_3012c01_mp4_ref.mov

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Tue Sep  1 17:20:05 2009	(r29612)
+++ trunk/mplayer.c	Tue Sep  1 17:52:13 2009	(r29613)
@@ -3219,7 +3219,7 @@ if (mpctx->demuxer && mpctx->demuxer->ty
     if ((strlen(bname)>10) && !strncmp(bname,"qt",2) && !strncmp(bname+3,"gateQT",6))
         continue;
 
-    if (!strncmp(bname,mp_basename(filename),strlen(bname))) // ignoring self-reference
+    if (!strcmp(playlist_entry,filename)) // ignoring self-reference
         continue;
 
     entry = play_tree_new();
@@ -3231,6 +3231,10 @@ if (mpctx->demuxer && mpctx->demuxer->ty
       {
 	strncpy(temp, filename, strlen(filename)-strlen(mp_basename(filename)));
 	temp[strlen(filename)-strlen(mp_basename(filename))]='\0';
+	if (!strcmp(temp, filename)) {
+	  free(temp);
+	  continue;
+	}
 	strcat(temp, playlist_entry);
 	play_tree_add_file(entry,temp);
 	mp_msg(MSGT_CPLAYER,MSGL_V,"Resolving reference to %s.\n",temp);