[Ffmpeg-cvslog] CVS: ffmpeg/libavformat raw.c,1.51,1.52

[Michael Niedermayer CVS]

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

Modified Files:
	raw.c 
Log Message:
always honor the user specified frame rate if set


Index: raw.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/raw.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- raw.c	30 Apr 2005 21:43:59 -0000	1.51
+++ raw.c	6 May 2005 14:19:17 -0000	1.52
@@ -235,14 +235,14 @@
 
     /* for mjpeg, specify frame rate */
     /* for mpeg4 specify it too (most mpeg4 streams dont have the fixed_vop_rate set ...)*/
-    if (st->codec.codec_id == CODEC_ID_MJPEG || 
-        st->codec.codec_id == CODEC_ID_MPEG4) {
-        if (ap && ap->time_base.num) {
-            av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den);
-        } else {
-            av_set_pts_info(st, 64, 1, 25);
-        }
+    if (ap && ap->time_base.num) {
+        av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den);
+    } else if ( st->codec.codec_id == CODEC_ID_MJPEG || 
+                st->codec.codec_id == CODEC_ID_MPEG4 ||
+                st->codec.codec_id == CODEC_ID_H264) {
+        av_set_pts_info(st, 64, 1, 25);
     }
+
     return 0;
 }