Mercurial > mplayer.hg

comparison libmpdemux/demux_mov.c @ 23010:74efb0fa8a0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
author nicodvb
date Fri, 20 Apr 2007 21:49:49 +0000
parents 4d81dbdf46b9
children 7b313a20939f
comparison
equal deleted inserted replaced
23009:41d042563508 23010:74efb0fa8a0b
657 } my_stdata; 657 } my_stdata;
658 #endif 658 #endif
659 int version, adjust; 659 int version, adjust;
660 int is_vorbis = 0; 660 int is_vorbis = 0;
661 sh_audio_t* sh=new_sh_audio(demuxer,priv->track_db); 661 sh_audio_t* sh=new_sh_audio(demuxer,priv->track_db);
662 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "mov", priv->track_db);
662 sh->format=trak->fourcc; 663 sh->format=trak->fourcc;
663 664
664 // crude audio delay from editlist0 hack ::atm 665 // crude audio delay from editlist0 hack ::atm
665 if(trak->editlist_size>=1) { 666 if(trak->editlist_size>=1) {
666 if(trak->editlist[0].pos == -1) { 667 if(trak->editlist[0].pos == -1) {
980 int i, entry; 981 int i, entry;
981 int flag, start, count_flag, end, palette_count, gray; 982 int flag, start, count_flag, end, palette_count, gray;
982 int hdr_ptr = 76; // the byte just after depth 983 int hdr_ptr = 76; // the byte just after depth
983 unsigned char *palette_map; 984 unsigned char *palette_map;
984 sh_video_t* sh=new_sh_video(demuxer,priv->track_db); 985 sh_video_t* sh=new_sh_video(demuxer,priv->track_db);
986 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "mov", priv->track_db);
985 int depth; 987 int depth;
986 sh->format=trak->fourcc; 988 sh->format=trak->fourcc;
987 989
988 // crude video delay from editlist0 hack ::atm 990 // crude video delay from editlist0 hack ::atm
989 if(trak->editlist_size>=1) { 991 if(trak->editlist_size>=1) {
1309 case MOV_TRAK_GENERIC: 1311 case MOV_TRAK_GENERIC:
1310 if (trak->fourcc == mmioFOURCC('m','p','4','s') || 1312 if (trak->fourcc == mmioFOURCC('m','p','4','s') ||
1311 trak->fourcc == mmioFOURCC('t','x','3','g') || 1313 trak->fourcc == mmioFOURCC('t','x','3','g') ||
1312 trak->fourcc == mmioFOURCC('t','e','x','t')) { 1314 trak->fourcc == mmioFOURCC('t','e','x','t')) {
1313 sh_sub_t *sh = new_sh_sub(demuxer, priv->track_db); 1315 sh_sub_t *sh = new_sh_sub(demuxer, priv->track_db);
1316 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_SubtitleID, "mov", priv->track_db);
1314 if (trak->fourcc == mmioFOURCC('m','p','4','s')) 1317 if (trak->fourcc == mmioFOURCC('m','p','4','s'))
1315 init_vobsub(sh, trak); 1318 init_vobsub(sh, trak);
1316 else 1319 else
1317 sh->type = 't'; 1320 sh->type = 't';
1318 } else 1321 } else