Mercurial > mplayer.hg
comparison libmpdemux/demuxer.c @ 20319:03e64a7a6d5e
Cosmetics: indentation fix indentation broken by last two demuxer.c commits
| author | reimar |
|---|---|
| date | Fri, 20 Oct 2006 19:36:59 +0000 |
| parents | d8d2bc754413 |
| children | 865b71a83296 |
comparison
equal
deleted
inserted
replaced
| 20318:d8d2bc754413 | 20319:03e64a7a6d5e |
|---|---|
| 662 if (file_format) { | 662 if (file_format) { |
| 663 if ((demuxer_desc = get_demuxer_desc_from_type(file_format))) { | 663 if ((demuxer_desc = get_demuxer_desc_from_type(file_format))) { |
| 664 demuxer = new_demuxer(stream,demuxer_desc->type,audio_id,video_id,dvdsub_id,filename); | 664 demuxer = new_demuxer(stream,demuxer_desc->type,audio_id,video_id,dvdsub_id,filename); |
| 665 if (demuxer_desc->check_file) | 665 if (demuxer_desc->check_file) |
| 666 fformat = demuxer_desc->check_file(demuxer); | 666 fformat = demuxer_desc->check_file(demuxer); |
| 667 if (force || !demuxer_desc->check_file) | 667 if (force || !demuxer_desc->check_file) |
| 668 fformat = demuxer_desc->type; | 668 fformat = demuxer_desc->type; |
| 669 if (fformat != 0) { | 669 if (fformat != 0) { |
| 670 if (fformat == demuxer_desc->type) { | 670 if (fformat == demuxer_desc->type) { |
| 671 demuxer_t *demux2 = demuxer; | 671 demuxer_t *demux2 = demuxer; |
| 672 // Move messages to demuxer detection code? | 672 // Move messages to demuxer detection code? |
| 673 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); |
| 674 file_format = demuxer_desc->type = fformat; | 674 file_format = demuxer_desc->type = fformat; |
| 675 if (!demuxer->desc->open || (demux2 = demuxer->desc->open(demuxer))) { | 675 if (!demuxer->desc->open || (demux2 = demuxer->desc->open(demuxer))) { |
| 676 demuxer = demux2; | 676 demuxer = demux2; |
| 677 goto dmx_open; | 677 goto dmx_open; |
| 678 } | |
| 679 } else { | |
| 680 // Format changed after check, recurse | |
| 681 free_demuxer(demuxer); | |
| 682 return demux_open_stream(stream, fformat, force, | |
| 683 audio_id, video_id, dvdsub_id, filename); | |
| 684 } | 678 } |
| 679 } else { | |
| 680 // Format changed after check, recurse | |
| 681 free_demuxer(demuxer); | |
| 682 return demux_open_stream(stream, fformat, force, | |
| 683 audio_id, video_id, dvdsub_id, filename); | |
| 685 } | 684 } |
| 686 // Check failed for forced demuxer, quit | 685 } |
| 687 free_demuxer(demuxer); | 686 // Check failed for forced demuxer, quit |
| 688 return NULL; | 687 free_demuxer(demuxer); |
| 688 return NULL; | |
| 689 } | 689 } |
| 690 } | 690 } |
| 691 | 691 |
| 692 // Test demuxers with safe file checks | 692 // Test demuxers with safe file checks |
| 693 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { | 693 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { |
| 711 audio_id, video_id, dvdsub_id, filename); | 711 audio_id, video_id, dvdsub_id, filename); |
| 712 if(demuxer) return demuxer; // done! | 712 if(demuxer) return demuxer; // done! |
| 713 file_format = DEMUXER_TYPE_UNKNOWN; | 713 file_format = DEMUXER_TYPE_UNKNOWN; |
| 714 } | 714 } |
| 715 } | 715 } |
| 716 free_demuxer(demuxer); | 716 free_demuxer(demuxer); |
| 717 demuxer = NULL; | 717 demuxer = NULL; |
| 718 } | 718 } |
| 719 } | 719 } |
| 720 | 720 |
| 721 // If no forced demuxer perform file extension based detection | 721 // If no forced demuxer perform file extension based detection |
| 722 // Ok. We're over the stable detectable fileformats, the next ones are a bit | 722 // Ok. We're over the stable detectable fileformats, the next ones are a bit |
| 756 audio_id, video_id, dvdsub_id, filename); | 756 audio_id, video_id, dvdsub_id, filename); |
| 757 if(demuxer) return demuxer; // done! | 757 if(demuxer) return demuxer; // done! |
| 758 file_format = DEMUXER_TYPE_UNKNOWN; | 758 file_format = DEMUXER_TYPE_UNKNOWN; |
| 759 } | 759 } |
| 760 } | 760 } |
| 761 free_demuxer(demuxer); | 761 free_demuxer(demuxer); |
| 762 demuxer = NULL; | 762 demuxer = NULL; |
| 763 } | 763 } |
| 764 } | 764 } |
| 765 | 765 |
| 766 return NULL; | 766 return NULL; |
| 767 //====== File format recognized, set up these for compatibility: ========= | 767 //====== File format recognized, set up these for compatibility: ========= |
| 768 dmx_open: | 768 dmx_open: |
| 769 | 769 |
| 770 demuxer->file_format=file_format; | 770 demuxer->file_format=file_format; |
| 771 | 771 |