Mercurial > mplayer.hg

comparison libmpdemux/demux_ts.c @ 18237:4231482179b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
author reynaldo
date Mon, 24 Apr 2006 07:20:34 +0000
parents 97aa495df9dd
children 6853dc0411c1
comparison
equal deleted inserted replaced
18236:d239a79a0002 18237:4231482179b6
592 if((! is_audio) && (! is_video) && (! is_sub)) 592 if((! is_audio) && (! is_video) && (! is_sub))
593 continue; 593 continue;
594 594
595 if(is_video) 595 if(is_video)
596 { 596 {
597 if (identify) 597 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", es.pid);
598 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_ID=%d\n", es.pid);
599 chosen_pid = (req_vpid == es.pid); 598 chosen_pid = (req_vpid == es.pid);
600 if((! chosen_pid) && (req_vpid > 0)) 599 if((! chosen_pid) && (req_vpid > 0))
601 continue; 600 continue;
602 } 601 }
603 else if(is_audio) 602 else if(is_audio)
604 { 603 {
605 if (identify) 604 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", es.pid);
606 { 605 if (es.lang[0] > 0)
607 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", es.pid); 606 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", es.pid, es.lang);
608 if (es.lang[0] > 0)
609 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AID_%d_LANG=%s\n", es.pid, es.lang);
610 }
611 if(req_apid > 0) 607 if(req_apid > 0)
612 { 608 {
613 chosen_pid = (req_apid == es.pid); 609 chosen_pid = (req_apid == es.pid);
614 if(! chosen_pid) 610 if(! chosen_pid)
615 continue; 611 continue;
623 param->apid = req_apid = es.pid; 619 param->apid = req_apid = es.pid;
624 } 620 }
625 } 621 }
626 else if(is_sub) 622 else if(is_sub)
627 { 623 {
628 if (identify) 624 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", es.pid);
629 { 625 if (es.lang[0] > 0)
630 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", es.pid); 626 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", es.pid, es.lang);
631 if (es.lang[0] > 0)
632 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SID_%d_LANG=%s\n", es.pid, es.lang);
633 }
634 chosen_pid = (req_spid == es.pid); 627 chosen_pid = (req_spid == es.pid);
635 if((! chosen_pid) && (req_spid > 0)) 628 if((! chosen_pid) && (req_spid > 0))
636 continue; 629 continue;
637 } 630 }
638 631