Mercurial > libavformat.hg

changeset 745:a03f1f7497ad libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
always honor the user specified frame rate if set
author michael
date Fri, 06 May 2005 14:19:17 +0000
parents da5b3b9e898e
children 5f07cc45fd50
files raw.c
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }