[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec h264.c,1.179,1.180

[Måns Rullgård CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv16874

Modified Files:
	h264.c 
Log Message:
interpret H264 VUI timing info correctly
work around bug in x264 build < 44


Index: h264.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- h264.c	12 Jan 2006 22:43:15 -0000	1.179
+++ h264.c	19 Jan 2006 00:19:15 -0000	1.180
@@ -4309,7 +4309,11 @@
             s->avctx->sample_aspect_ratio.den = 1;
 
         if(h->sps.timing_info_present_flag){
-            s->avctx->time_base= (AVRational){h->sps.num_units_in_tick, h->sps.time_scale};
+            s->avctx->time_base= (AVRational){h->sps.num_units_in_tick * 2, h->sps.time_scale};
+	    if(h->x264_build > 0 && h->x264_build < 44)
+		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);
         }
     }