Mercurial > libavformat.hg

comparison mov.c @ 2969:f3a3115a96e4 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set correct codec type and id for text subtitles. fixes http://samples.mplayerhq.hu/mov/subtitles-embedded/subtitlemovie.mov closes issue341
author michael
date Sat, 26 Jan 2008 20:30:03 +0000
parents bd458b341e40
children ed7e36770ee5
comparison
equal deleted inserted replaced
2968:bd458b341e40 2969:f3a3115a96e4
622 id = codec_get_id(codec_movvideo_tags, format); 622 id = codec_get_id(codec_movvideo_tags, format);
623 if (id <= 0) 623 if (id <= 0)
624 id = codec_get_id(codec_bmp_tags, format); 624 id = codec_get_id(codec_bmp_tags, format);
625 if (id > 0) 625 if (id > 0)
626 st->codec->codec_type = CODEC_TYPE_VIDEO; 626 st->codec->codec_type = CODEC_TYPE_VIDEO;
627 else if(st->codec->codec_type == CODEC_TYPE_DATA){
628 id = codec_get_id(ff_codec_movsubtitle_tags, format);
629 if(id > 0)
630 st->codec->codec_type = CODEC_TYPE_SUBTITLE;
631 }
627 } 632 }
628 633
629 dprintf(c->fc, "size=%d 4CC= %c%c%c%c codec_type=%d\n", size, 634 dprintf(c->fc, "size=%d 4CC= %c%c%c%c codec_type=%d\n", size,
630 (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff, 635 (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff,
631 (format >> 24) & 0xff, st->codec->codec_type); 636 (format >> 24) & 0xff, st->codec->codec_type);