summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-01 15:52:13 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-01 15:52:13 +0000
commitd1ff4b7f906536be0e8f6c7cecbf117867a54992 (patch)
tree03e0b2189833e3857e125e039ca88855a9f9e7ef
parenta1f744cb07d006e2b8f02fbab94e5d94c09e8361 (diff)
downloadmpv-d1ff4b7f906536be0e8f6c7cecbf117867a54992.tar.bz2
mpv-d1ff4b7f906536be0e8f6c7cecbf117867a54992.tar.xz
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 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29613 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--mplayer.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index 49f2190bf9..2783929819 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3219,7 +3219,7 @@ if (mpctx->demuxer && mpctx->demuxer->type==DEMUXER_TYPE_PLAYLIST)
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->type==DEMUXER_TYPE_PLAYLIST)
{
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);