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

Michael Niedermayer CVS michael
Sun Aug 14 18:19:22 CEST 2005


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

Modified Files:
	utils.c 
Log Message:
a few checks, seems i forgot to commit this


Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/utils.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- utils.c	14 Aug 2005 15:42:40 -0000	1.160
+++ utils.c	14 Aug 2005 16:19:20 -0000	1.161
@@ -2158,6 +2158,30 @@
     int ret, i;
     AVStream *st;
 
+    // some sanity checks
+    for(i=0;i<s->nb_streams;i++) {
+        st = s->streams[i];
+
+        switch (st->codec->codec_type) {
+        case CODEC_TYPE_AUDIO:
+            if(st->codec->sample_rate<=0){
+                av_log(s, AV_LOG_ERROR, "sample rate not set\n");
+                return -1;
+            }
+            break;
+        case CODEC_TYPE_VIDEO:
+            if(st->codec->time_base.num<=0 || st->codec->time_base.den<=0){ //FIXME audio too?
+                av_log(s, AV_LOG_ERROR, "time base not set\n");
+                return -1;
+            }
+            if(st->codec->width<=0 || st->codec->height<=0){
+                av_log(s, AV_LOG_ERROR, "dimensions not set\n");
+                return -1;
+            }
+            break;
+        }
+    }
+
     ret = s->oformat->write_header(s);
     if (ret < 0)
         return ret;





More information about the ffmpeg-cvslog mailing list