[SCM] libav/experimental: Remove DEFAULT_FRAME_RATE_BASE.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:29:46 UTC 2013


The following commit has been merged in the experimental branch:
commit 38360668d619928aaf54e1e17249f490f6fdf296
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Sep 8 15:28:07 2008 +0000

    Remove DEFAULT_FRAME_RATE_BASE.
    
    Originally committed as revision 15265 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 6a58ea7..73d90f5 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -798,8 +798,6 @@ typedef struct AVFrame {
     FF_COMMON_FRAME
 } AVFrame;
 
-#define DEFAULT_FRAME_RATE_BASE 1001000
-
 /**
  * main external API structure.
  * New fields can be added to the end with minor version bumps.
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index adda586..6b86e55 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1492,7 +1492,7 @@ int av_parse_video_frame_rate(AVRational *frame_rate, const char *arg)
     }
     else {
         /* Finally we give up and parse it as double */
-        AVRational time_base = av_d2q(strtod(arg, 0), DEFAULT_FRAME_RATE_BASE);
+        AVRational time_base = av_d2q(strtod(arg, 0), 1001000);
         frame_rate->den = time_base.den;
         frame_rate->num = time_base.num;
     }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list