1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-23 03:37:27 +00:00

Fix move playlists (control must be returned to mplayer.c, with the demuxer

returning the real URL as a packet).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16327 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2005-08-31 13:04:22 +00:00
parent c5afd2f87f
commit e1d1e3bc74
2 changed files with 5 additions and 1 deletions

View File

@ -506,7 +506,7 @@ skip_chunk:
free(priv);
if ((flags==5) || (flags==7)) // reference & header sent
return DEMUXER_TYPE_MOV;
return DEMUXER_TYPE_PLAYLIST;
if(flags==1)
mp_msg(MSGT_DEMUX,MSGL_WARN,"MOV: missing data (mdat) chunk! Maybe broken file...\n");

View File

@ -629,6 +629,8 @@ for (i = 0; (demuxer_desc = demuxer_list[i]); i++) {
file_format = fformat;
break;
} else {
if (fformat == DEMUXER_TYPE_PLAYLIST)
return demuxer; // handled in mplayer.c
// Format changed after check, recurse
free_demuxer(demuxer);
demuxer=demux_open_stream(stream, fformat, force,
@ -672,6 +674,8 @@ for (i = 0; (demuxer_desc = demuxer_list[i]); i++) {
file_format = fformat;
break;
} else {
if (fformat == DEMUXER_TYPE_PLAYLIST)
return demuxer; // handled in mplayer.c
// Format changed after check, recurse
free_demuxer(demuxer);
demuxer=demux_open_stream(stream, fformat, force,