Mercurial > mplayer.hg

comparison libmpdemux/demuxer.c @ 16326:88b9c7b0e773

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix move playlists (control must be returned to mplayer.c, with the demuxer returning the real URL as a packet).
author reimar
date Wed, 31 Aug 2005 13:04:22 +0000
parents efbfac98cab1
children 6ff303d2876b
comparison
equal deleted inserted replaced
16325:739c473493d2 16326:88b9c7b0e773
627 if (fformat == demuxer_desc->type) { 627 if (fformat == demuxer_desc->type) {
628 mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc); 628 mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc);
629 file_format = fformat; 629 file_format = fformat;
630 break; 630 break;
631 } else { 631 } else {
632 if (fformat == DEMUXER_TYPE_PLAYLIST)
633 return demuxer; // handled in mplayer.c
632 // Format changed after check, recurse 634 // Format changed after check, recurse
633 free_demuxer(demuxer); 635 free_demuxer(demuxer);
634 demuxer=demux_open_stream(stream, fformat, force, 636 demuxer=demux_open_stream(stream, fformat, force,
635 audio_id, video_id, dvdsub_id, filename); 637 audio_id, video_id, dvdsub_id, filename);
636 if(demuxer) return demuxer; // done! 638 if(demuxer) return demuxer; // done!
670 if (fformat == demuxer_desc->type) { 672 if (fformat == demuxer_desc->type) {
671 mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc); 673 mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc);
672 file_format = fformat; 674 file_format = fformat;
673 break; 675 break;
674 } else { 676 } else {
677 if (fformat == DEMUXER_TYPE_PLAYLIST)
678 return demuxer; // handled in mplayer.c
675 // Format changed after check, recurse 679 // Format changed after check, recurse
676 free_demuxer(demuxer); 680 free_demuxer(demuxer);
677 demuxer=demux_open_stream(stream, fformat, force, 681 demuxer=demux_open_stream(stream, fformat, force,
678 audio_id, video_id, dvdsub_id, filename); 682 audio_id, video_id, dvdsub_id, filename);
679 if(demuxer) return demuxer; // done! 683 if(demuxer) return demuxer; // done!