summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-02-26 21:09:24 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-02-26 21:09:24 +0000
commitf56995b4a69a3797043f2de078ec0eb85352a4b3 (patch)
tree92e03c9ecda234454b44bce538ffc2ce0aa24cfb /libavcodec
parent26aedb4ab35e0f5bffdb9a5d843dd479072f23af (diff)
Half user provided time_base once during the first frame when there is no
timebase stored in the h264 stream. This should fix fate. (ffmpeg.c used pict_repeat with its default 1/25 timebase) Originally committed as revision 17622 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 03d70b7d78..64ca5b7e66 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3768,6 +3768,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
s->avctx->time_base.den *= 2;
av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den,
s->avctx->time_base.num, s->avctx->time_base.den, 1<<30);
+ }else if(!h->sps.time_scale && !s->avctx->frame_number){
+ s->avctx->time_base.den *=2;
+ h->sps.time_scale= s->avctx->time_base.den;
}
}