Commit 035f6620 authored by Michael Niedermayer's avatar Michael Niedermayer

mpeg4videoparser: support using timestamps from codec.

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent a6b3471c
...@@ -93,6 +93,13 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1, ...@@ -93,6 +93,13 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1,
if (s->width && (!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height)) { if (s->width && (!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height)) {
avcodec_set_dimensions(avctx, s->width, s->height); avcodec_set_dimensions(avctx, s->width, s->height);
} }
if((s1->flags & PARSER_FLAG_USE_CODEC_TS) && s->avctx->time_base.den>0 && ret>=0){
av_assert1(s1->pts == AV_NOPTS_VALUE);
av_assert1(s1->dts == AV_NOPTS_VALUE);
s1->pts = av_rescale_q(s->time, (AVRational){1, s->avctx->time_base.den}, (AVRational){1, 1200000});
}
s1->pict_type= s->pict_type; s1->pict_type= s->pict_type;
pc->first_picture = 0; pc->first_picture = 0;
return ret; return ret;
......
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