RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-11 04:01:31 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpdemux/demux_mov.c
View File

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

4
libmpdemux/demuxer.c
View File

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