[SCM] libav/experimental: avutil: move av_get_time_base_q() after include rational.h

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:02:56 UTC 2014


The following commit has been merged in the experimental branch:
commit b0bdc2a7123abd0287de435726ab68e9e475a8d8
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Apr 22 22:44:14 2014 +0200

    avutil: move av_get_time_base_q() after include rational.h
    
    Fix compilation
    
    Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
    Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 8c6e571..f056415 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -240,11 +240,6 @@ enum AVMediaType {
 #define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
 
 /**
- * Return the fractional representation of the internal time base.
- */
-AVRational av_get_time_base_q(void);
-
-/**
  * @}
  * @}
  * @defgroup lavu_picture Image related
@@ -283,6 +278,11 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
 #include "macros.h"
 
 /**
+ * Return the fractional representation of the internal time base.
+ */
+AVRational av_get_time_base_q(void);
+
+/**
  * @}
  * @}
  */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list