avformat/4xm: Change fps to AVRational
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 May 2015 20:08:13 +0000 (22:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 May 2015 20:36:02 +0000 (22:36 +0200)
This fixes the video timebase as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/4xm.c
tests/ref/fate/4xm-2

index 240e5a4..8fdad18 100644 (file)
@@ -77,7 +77,7 @@ typedef struct FourxmDemuxContext {
     AudioTrack *tracks;
 
     int64_t video_pts;
-    float fps;
+    AVRational fps;
 } FourxmDemuxContext;
 
 static int fourxm_probe(AVProbeData *p)
@@ -104,7 +104,7 @@ static int parse_vtrk(AVFormatContext *s,
     if (!st)
         return AVERROR(ENOMEM);
 
-    avpriv_set_pts_info(st, 60, 1, fourxm->fps);
+    avpriv_set_pts_info(st, 60, fourxm->fps.den, fourxm->fps.num);
 
     fourxm->video_stream_index = st->index;
 
@@ -206,7 +206,7 @@ static int fourxm_read_header(AVFormatContext *s)
 
     fourxm->track_count = 0;
     fourxm->tracks      = NULL;
-    fourxm->fps         = 1.0;
+    fourxm->fps         = (AVRational){1,1};
 
     /* skip the first 3 32-bit numbers */
     avio_skip(pb, 12);
@@ -241,7 +241,7 @@ static int fourxm_read_header(AVFormatContext *s)
                 ret = AVERROR_INVALIDDATA;
                 goto fail;
             }
-            fourxm->fps = av_int2float(AV_RL32(&header[i + 12]));
+            fourxm->fps = av_d2q(av_int2float(AV_RL32(&header[i + 12])), 10000);
         } else if (fourcc_tag == vtrk_TAG) {
             if ((ret = parse_vtrk(s, fourxm, header + i, size,
                                   header_size - i)) < 0)
index cf71357..6895d12 100644 (file)
@@ -1,4 +1,4 @@
-#tb 0: 1/6
+#tb 0: 4/25
 0,          0,          0,        1,    80640, 0x00000000
 0,          1,          1,        1,    80640, 0x3a942680
 0,          2,          2,        1,    80640, 0x3a942680