Commit e1d6a02c authored by bcoudurier's avatar bcoudurier

factorize av_set_pts_info

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18808 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 92f06d79
...@@ -1758,7 +1758,6 @@ static int mov_write_header(AVFormatContext *s) ...@@ -1758,7 +1758,6 @@ static int mov_write_header(AVFormatContext *s)
track->height = track->tag>>24 == 'n' ? 486 : 576; track->height = track->tag>>24 == 'n' ? 486 : 576;
} }
track->timescale = st->codec->time_base.den; track->timescale = st->codec->time_base.den;
av_set_pts_info(st, 64, 1, st->codec->time_base.den);
if (track->mode == MODE_MOV && track->timescale > 100000) if (track->mode == MODE_MOV && track->timescale > 100000)
av_log(s, AV_LOG_WARNING, av_log(s, AV_LOG_WARNING,
"WARNING codec timebase is very high. If duration is too long,\n" "WARNING codec timebase is very high. If duration is too long,\n"
...@@ -1766,7 +1765,6 @@ static int mov_write_header(AVFormatContext *s) ...@@ -1766,7 +1765,6 @@ static int mov_write_header(AVFormatContext *s)
"or choose different container.\n"); "or choose different container.\n");
}else if(st->codec->codec_type == CODEC_TYPE_AUDIO){ }else if(st->codec->codec_type == CODEC_TYPE_AUDIO){
track->timescale = st->codec->sample_rate; track->timescale = st->codec->sample_rate;
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
if(!st->codec->frame_size && !av_get_bits_per_sample(st->codec->codec_id)) { if(!st->codec->frame_size && !av_get_bits_per_sample(st->codec->codec_id)) {
av_log(s, AV_LOG_ERROR, "track %d: codec frame size is not set\n", i); av_log(s, AV_LOG_ERROR, "track %d: codec frame size is not set\n", i);
goto error; goto error;
...@@ -1784,10 +1782,11 @@ static int mov_write_header(AVFormatContext *s) ...@@ -1784,10 +1782,11 @@ static int mov_write_header(AVFormatContext *s)
} }
}else if(st->codec->codec_type == CODEC_TYPE_SUBTITLE){ }else if(st->codec->codec_type == CODEC_TYPE_SUBTITLE){
track->timescale = st->codec->time_base.den; track->timescale = st->codec->time_base.den;
av_set_pts_info(st, 64, 1, st->codec->time_base.den);
} }
if (!track->height) if (!track->height)
track->height = st->codec->height; track->height = st->codec->height;
av_set_pts_info(st, 64, 1, track->timescale);
} }
mov_write_mdat_tag(pb, mov); mov_write_mdat_tag(pb, mov);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment