summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ts.c
diff options
context:
space:
mode:
authormosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-25 22:24:00 +0000
committermosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-25 22:24:00 +0000
commit50a86fcc343f1026ee8cab0d9788c6bee35e720b (patch)
tree3b5ab5a6d0a0669a30633c41be8a8311dac3ef42 /libmpdemux/demux_ts.c
parent0e4cb07c81decd033025375cdc40f7376a583203 (diff)
downloadmpv-50a86fcc343f1026ee8cab0d9788c6bee35e720b.tar.bz2
mpv-50a86fcc343f1026ee8cab0d9788c6bee35e720b.tar.xz
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14047 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ts.c')
-rw-r--r--libmpdemux/demux_ts.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 1f3a19c0cc..6e377d4a11 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -54,6 +54,7 @@ int ts_prog;
int ts_keep_broken=0;
off_t ts_probe = TS_MAX_PROBE_SIZE;
extern char *dvdsub_lang, *audio_lang; //for -alang
+extern int demux_aid_vid_mismatch;
typedef enum
{
@@ -510,12 +511,20 @@ 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);
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);
+ }
if(req_apid > 0)
{
chosen_pid = (req_apid == es.pid);
@@ -533,6 +542,12 @@ 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);
+ }
chosen_pid = (req_spid == es.pid);
if((! chosen_pid) && (req_spid > 0))
continue;
@@ -788,6 +803,7 @@ demuxer_t *demux_open_ts(demuxer_t * demuxer)
demuxer->sub->id = params.spid;
priv->prog = params.prog;
+ demux_aid_vid_mismatch = 1; // don't identify in new_sh_* since ids don't match
if(params.vtype != UNKNOWN)
{