Mercurial > mplayer.hg
comparison libmpdemux/demux_ogg.c @ 12430:d82d84b94125
Be more verbose and tell the user which subtitle stream has been selected (if any).
author | mosu |
---|---|
date | Wed, 05 May 2004 21:05:36 +0000 |
parents | af557de9daee |
children | aa7216363fd4 |
comparison
equal
deleted
inserted
replaced
12429:98d67f488df2 | 12430:d82d84b94125 |
---|---|
438 val = *cmt + 9; | 438 val = *cmt + 9; |
439 // check for -slang if subs are uninitialized yet | 439 // check for -slang if subs are uninitialized yet |
440 if (os->text && d->sub->id == -1 && demux_ogg_check_lang(val, dvdsub_lang)) | 440 if (os->text && d->sub->id == -1 && demux_ogg_check_lang(val, dvdsub_lang)) |
441 { | 441 { |
442 d->sub->id = id; | 442 d->sub->id = id; |
443 mp_msg(MSGT_DEMUX, MSGL_V, "Stream language matched -slang: %s\n", val); | 443 mp_msg(MSGT_DEMUX, MSGL_V, "OGG demuxer: Displaying the subtitle stream with the id %d which matched -slang %s\n", id, val); |
444 } | 444 } |
445 else | 445 else |
446 hdr = "Language"; | 446 hdr = "Language"; |
447 } | 447 } |
448 else if (!strncasecmp(*cmt, "ENCODER_URL=", 12)) | 448 else if (!strncasecmp(*cmt, "ENCODER_URL=", 12)) |
964 /* Disable the subs only if there are no text streams at all. | 964 /* Disable the subs only if there are no text streams at all. |
965 Otherwise the stream to display might be chosen later when the comment | 965 Otherwise the stream to display might be chosen later when the comment |
966 packet is encountered and the user used -slang instead of -sid. */ | 966 packet is encountered and the user used -slang instead of -sid. */ |
967 if(!n_text) | 967 if(!n_text) |
968 demuxer->sub->id = -2; | 968 demuxer->sub->id = -2; |
969 else if (text_id >= 0) | 969 else if (text_id >= 0) { |
970 demuxer->sub->id = text_id; | 970 demuxer->sub->id = text_id; |
971 mp_msg(MSGT_DEMUX, MSGL_V, "OGG demuxer: Displaying the subtitle stream with the id %d\n", text_id); | |
972 } | |
971 | 973 |
972 ogg_d->final_granulepos=0; | 974 ogg_d->final_granulepos=0; |
973 if(!s->end_pos) | 975 if(!s->end_pos) |
974 demuxer->seekable = 0; | 976 demuxer->seekable = 0; |
975 else { | 977 else { |