Mercurial > mplayer.hg
comparison libmpdemux/demux_mpg.c @ 21918:ba25f87420b3
removed useless #if1s added too long time ago
author | nicodvb |
---|---|
date | Mon, 15 Jan 2007 21:39:30 +0000 |
parents | 57bb521c89e5 |
children | 05223564b604 |
comparison
equal
deleted
inserted
replaced
21917:57bb521c89e5 | 21918:ba25f87420b3 |
---|---|
506 if(num_elementary_packetsPES>=4 && num_elementary_packetsPES>=num_elementary_packets100-4) { | 506 if(num_elementary_packetsPES>=4 && num_elementary_packetsPES>=num_elementary_packets100-4) { |
507 return file_format; | 507 return file_format; |
508 } | 508 } |
509 file_format=DEMUXER_TYPE_MPEG_ES; // <-- hack is here :) | 509 file_format=DEMUXER_TYPE_MPEG_ES; // <-- hack is here :) |
510 } else | 510 } else |
511 #if 1 | |
512 // fuzzy mpeg4-es detection. do NOT enable without heavy testing of mpeg formats detection! | 511 // fuzzy mpeg4-es detection. do NOT enable without heavy testing of mpeg formats detection! |
513 if(num_elementary_packets1B6>3 && num_elementary_packets12x>=1 && | 512 if(num_elementary_packets1B6>3 && num_elementary_packets12x>=1 && |
514 num_elementary_packetsPES==0 && num_elementary_packets100<=num_elementary_packets12x && | 513 num_elementary_packetsPES==0 && num_elementary_packets100<=num_elementary_packets12x && |
515 demuxer->synced<2) { | 514 demuxer->synced<2) { |
516 file_format=DEMUXER_TYPE_MPEG4_ES; | 515 file_format=DEMUXER_TYPE_MPEG4_ES; |
517 } else | 516 } else |
518 #endif | |
519 #if 1 | |
520 // fuzzy h264-es detection. do NOT enable without heavy testing of mpeg formats detection! | 517 // fuzzy h264-es detection. do NOT enable without heavy testing of mpeg formats detection! |
521 if((num_h264_slice>3 || (num_h264_dpa>3 && num_h264_dpb>3 && num_h264_dpc>3)) && | 518 if((num_h264_slice>3 || (num_h264_dpa>3 && num_h264_dpb>3 && num_h264_dpc>3)) && |
522 /* FIXME num_h264_sps>=1 && */ num_h264_pps>=1 && num_h264_idr>=1 && | 519 /* FIXME num_h264_sps>=1 && */ num_h264_pps>=1 && num_h264_idr>=1 && |
523 num_elementary_packets1B6==0 && num_elementary_packetsPES==0 && | 520 num_elementary_packets1B6==0 && num_elementary_packetsPES==0 && |
524 demuxer->synced<2) { | 521 demuxer->synced<2) { |
525 file_format=DEMUXER_TYPE_H264_ES; | 522 file_format=DEMUXER_TYPE_H264_ES; |
526 } else | 523 } else |
527 #endif | |
528 { | 524 { |
529 if(demuxer->synced==2) | 525 if(demuxer->synced==2) |
530 mp_msg(MSGT_DEMUXER,MSGL_ERR,"MPEG: " MSGTR_MissingVideoStreamBug); | 526 mp_msg(MSGT_DEMUXER,MSGL_ERR,"MPEG: " MSGTR_MissingVideoStreamBug); |
531 else | 527 else |
532 mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_NotSystemStream); | 528 mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_NotSystemStream); |