Make sure av_set_pts_info() does not set the fields of a timebase to

negative values.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19325 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/utils.c b/libavformat/utils.c
index b1c0363fde02ff8cc7db17700bc7806be75033ed..d7bc23f3c99d404aef9636ddf51af23aacdb3473 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3306,11 +3306,11 @@ char *ff_data_to_hex(char *buff, const uint8_t *src, int s)
 void av_set_pts_info(AVStream *s, int pts_wrap_bits,
                      unsigned int pts_num, unsigned int pts_den)
 {
-    unsigned int gcd= av_gcd(pts_num, pts_den);
     s->pts_wrap_bits = pts_wrap_bits;
-    s->time_base.num = pts_num/gcd;
-    s->time_base.den = pts_den/gcd;
 
-    if(gcd>1)
-        av_log(NULL, AV_LOG_DEBUG, "st:%d removing common factor %d from timebase\n", s->index, gcd);
+    if(av_reduce(&s->time_base.num, &s->time_base.den, pts_num, pts_den, INT_MAX)){
+        if(s->time_base.num != pts_num)
+            av_log(NULL, AV_LOG_DEBUG, "st:%d removing common factor %d from timebase\n", s->index, pts_num/s->time_base.num);
+    }else
+        av_log(NULL, AV_LOG_WARNING, "st:%d has too large timebase, reducing\n", s->index);
 }