Mercurial > libavformat.hg
changeset 1241:11fbe0326131 libavformat
use correct tag for h263 in mov
| author | bcoudurier |
|---|---|
| date | Mon, 07 Aug 2006 15:48:26 +0000 |
| parents | 504be467b795 |
| children | 996ce2a68147 |
| files | movenc.c |
| diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/movenc.c Mon Aug 07 15:04:15 2006 +0000 +++ b/movenc.c Mon Aug 07 15:48:26 2006 +0000 @@ -532,6 +532,7 @@ { CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') }, { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, + { CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, { CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* special handling in mov_find_video_codec_tag */ @@ -561,6 +562,11 @@ else tag = MKTAG('d', 'v', 'p', 'p'); } + } else if (track->enc->codec_id == CODEC_ID_H263) { + if (track->mode == MODE_MOV) + tag = MKTAG('h', '2', '6', '3'); + else + tag = MKTAG('s', '2', '6', '3'); } else { tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id); } @@ -1461,6 +1467,8 @@ MOVTrack *track= &mov->tracks[i]; track->enc = st->codec; + track->language = ff_mov_iso639_to_lang(st->language, mov->mode != MODE_MOV); + track->mode = mov->mode; if(st->codec->codec_type == CODEC_TYPE_VIDEO){ track->tag = mov_find_video_codec_tag(s, track); av_set_pts_info(st, 64, 1, st->codec->time_base.den); @@ -1469,8 +1477,6 @@ av_set_pts_info(st, 64, 1, st->codec->sample_rate); track->sampleSize = (av_get_bits_per_sample(st->codec->codec_id) >> 3) * st->codec->channels; } - track->language = ff_mov_iso639_to_lang(st->language, mov->mode != MODE_MOV); - track->mode = mov->mode; } mov_write_mdat_tag(pb, mov);