# HG changeset patch
# User michael
# Date 1115389157 0
# Node ID a03f1f7497adc88f27910554cd9d3c6310927e11
# Parent  da5b3b9e898e8456d39044046d9a17a4c4c1b8b2
always honor the user specified frame rate if set

diff -r da5b3b9e898e -r a03f1f7497ad raw.c
--- a/raw.c	Fri May 06 03:19:45 2005 +0000
+++ b/raw.c	Fri May 06 14:19:17 2005 +0000
@@ -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;
 }