diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-02 19:55:24 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-02 19:55:24 +0000 |
commit | 9600686eb5efa931e90d5be3f9920378f97b3118 (patch) | |
tree | 337dd975033f420907c309287a98122fc3478fcc /mplayer.c | |
parent | 76cb85c05677e4ac2669dea5af1be9a05cbc17bb (diff) | |
download | mpv-9600686eb5efa931e90d5be3f9920378f97b3118.tar.bz2 mpv-9600686eb5efa931e90d5be3f9920378f97b3118.tar.xz |
10l, fix misplaced check in r29613, for loop detection we must compare
current file name against full name to be added, not current file name
against new base path.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29637 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3243,11 +3243,11 @@ 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'; + strcat(temp, playlist_entry); 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); free(temp); |