Mercurial > libavformat.hg

changeset 3099:b74cbb146e2d libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix wc3movie demuxer to conform to the PTS API
author melanson
date Sat, 01 Mar 2008 02:28:47 +0000
parents fdcab2321805
children 5f769b20cc76
files wc3movie.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/wc3movie.c	Sat Mar 01 01:43:19 2008 +0000
+++ b/wc3movie.c	Sat Mar 01 02:28:47 2008 +0000
@@ -55,7 +55,7 @@
 #define WC3_AUDIO_BITS 16
 
 /* nice, constant framerate */
-#define WC3_FRAME_PTS_INC (90000 / 15)
+#define WC3_FRAME_FPS 15
 
 #define PALETTE_SIZE (256 * 3)
 #define PALETTE_COUNT 256
@@ -239,7 +239,7 @@
     st = av_new_stream(s, 0);
     if (!st)
         return AVERROR(ENOMEM);
-    av_set_pts_info(st, 33, 1, 90000);
+    av_set_pts_info(st, 33, 1, WC3_FRAME_FPS);
     wc3->video_stream_index = st->index;
     st->codec->codec_type = CODEC_TYPE_VIDEO;
     st->codec->codec_id = CODEC_ID_XAN_WC3;
@@ -253,7 +253,7 @@
     st = av_new_stream(s, 0);
     if (!st)
         return AVERROR(ENOMEM);
-    av_set_pts_info(st, 33, 1, 90000);
+    av_set_pts_info(st, 33, 1, WC3_FRAME_FPS);
     wc3->audio_stream_index = st->index;
     st->codec->codec_type = CODEC_TYPE_AUDIO;
     st->codec->codec_id = CODEC_ID_PCM_S16LE;
@@ -356,7 +356,7 @@
                 ret = AVERROR(EIO);
 
             /* time to advance pts */
-            wc3->pts += WC3_FRAME_PTS_INC;
+            wc3->pts++;
 
             packet_read = 1;
             break;