[Ffmpeg-cvslog] CVS: ffmpeg/libavformat utils.c,1.161,1.162

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv4923/libavformat

Modified Files:
	utils.c 
Log Message:
minor fixes for invalid audio data patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)


Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/utils.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- utils.c	14 Aug 2005 16:19:20 -0000	1.161
+++ utils.c	14 Aug 2005 16:37:29 -0000	1.162
@@ -2188,20 +2188,24 @@
 
     /* init PTS generation */
     for(i=0;i<s->nb_streams;i++) {
+        int64_t den = AV_NOPTS_VALUE;
         st = s->streams[i];
 
         switch (st->codec->codec_type) {
         case CODEC_TYPE_AUDIO:
-            av_frac_init(&st->pts, 0, 0, 
-                         (int64_t)st->time_base.num * st->codec->sample_rate);
+            den = (int64_t)st->time_base.num * st->codec->sample_rate;
             break;
         case CODEC_TYPE_VIDEO:
-            av_frac_init(&st->pts, 0, 0, 
-                         (int64_t)st->time_base.num * st->codec->time_base.den);
+            den = (int64_t)st->time_base.num * st->codec->time_base.den;
             break;
         default:
             break;
         }
+        if (den != AV_NOPTS_VALUE) {
+            if (den <= 0)
+                return AVERROR_INVALIDDATA;
+            av_frac_init(&st->pts, 0, 0, den);
+        }
     }
     return 0;
 }