[FFmpeg-cvslog] r12281 - trunk/libavformat/idcin.c

melanson subversion
Sat Mar 1 02:43:20 CET 2008


Author: melanson
Date: Sat Mar  1 02:43:19 2008
New Revision: 12281

Log:
fix the id CIN demuxer by using the pts API correctly


Modified:
   trunk/libavformat/idcin.c

Modified: trunk/libavformat/idcin.c
==============================================================================
--- trunk/libavformat/idcin.c	(original)
+++ trunk/libavformat/idcin.c	Sat Mar  1 02:43:19 2008
@@ -71,7 +71,7 @@
 #include "avformat.h"
 
 #define HUFFMAN_TABLE_SIZE (64 * 1024)
-#define FRAME_PTS_INC (90000 / 14)
+#define IDCIN_FPS 14
 
 typedef struct IdcinDemuxContext {
     int video_stream_index;
@@ -152,7 +152,7 @@ static int idcin_read_header(AVFormatCon
     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, IDCIN_FPS);
     idcin->video_stream_index = st->index;
     st->codec->codec_type = CODEC_TYPE_VIDEO;
     st->codec->codec_id = CODEC_ID_IDCIN;
@@ -175,7 +175,7 @@ static int idcin_read_header(AVFormatCon
         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, IDCIN_FPS);
         idcin->audio_stream_index = st->index;
         st->codec->codec_type = CODEC_TYPE_AUDIO;
         st->codec->codec_tag = 1;
@@ -271,7 +271,7 @@ static int idcin_read_packet(AVFormatCon
         pkt->pts = idcin->pts;
 
         idcin->current_audio_chunk ^= 1;
-        idcin->pts += FRAME_PTS_INC;
+        idcin->pts++;
     }
 
     if (idcin->audio_present)




More information about the ffmpeg-cvslog mailing list