diff options
| author | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-24 07:20:34 +0000 |
|---|---|---|
| committer | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-24 07:20:34 +0000 |
| commit | 3a406e94d77b06d75e670cf1ed8ae9c52e207e0a (patch) | |
| tree | 35cee7d854c288fa5856a9c05700b992eab01fbd /libmpdemux/demux_ts.c | |
| parent | 558f53de4bb36589d5da9897eab83d529e0e13f2 (diff) | |
| download | mpv-3a406e94d77b06d75e670cf1ed8ae9c52e207e0a.tar.bz2 mpv-3a406e94d77b06d75e670cf1ed8ae9c52e207e0a.tar.xz | |
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
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ts.c')
| -rw-r--r-- | libmpdemux/demux_ts.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index aeffd8ccd4..1af25ace84 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -594,20 +594,16 @@ static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param) if(is_video) { - if (identify) - mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_ID=%d\n", es.pid); + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", es.pid); chosen_pid = (req_vpid == es.pid); if((! chosen_pid) && (req_vpid > 0)) continue; } else if(is_audio) { - if (identify) - { - mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", es.pid); - if (es.lang[0] > 0) - mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AID_%d_LANG=%s\n", es.pid, es.lang); - } + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", es.pid); + if (es.lang[0] > 0) + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", es.pid, es.lang); if(req_apid > 0) { chosen_pid = (req_apid == es.pid); @@ -625,12 +621,9 @@ static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param) } else if(is_sub) { - if (identify) - { - mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", es.pid); - if (es.lang[0] > 0) - mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SID_%d_LANG=%s\n", es.pid, es.lang); - } + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", es.pid); + if (es.lang[0] > 0) + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", es.pid, es.lang); chosen_pid = (req_spid == es.pid); if((! chosen_pid) && (req_spid > 0)) continue; |