[FFmpeg-cvslog] lavf: add proper enum type for fmt ctx duration esitmation method

Michael Bradshaw git at videolan.org
Thu Jun 28 10:08:26 CEST 2012


ffmpeg | branch: master | Michael Bradshaw <mbradshaw at sorensonmedia.com> | Fri Jun 22 17:03:18 2012 -0600| [fc5999d0270ef83b9229e173b4106ae374041a19] | committer: Nicolas George

lavf: add proper enum type for fmt ctx duration esitmation method

Signed-off-by: Michael Bradshaw <mbradshaw at sorensonmedia.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc5999d0270ef83b9229e173b4106ae374041a19
---

 libavformat/avformat.h |   19 +++++++++++++------
 libavformat/options.c  |    2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 143c48e..807c7ac 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -838,6 +838,17 @@ typedef struct AVChapter {
     AVDictionary *metadata;
 } AVChapter;
 
+
+/**
+ * The duration of a video can be estimated through various ways, and this enum can be used
+ * to know how the duration was estimated.
+ */
+enum AVDurationEstimationMethod {
+    AVFMT_DURATION_FROM_PTS,    ///< Duration accurately estimated from PTSes
+    AVFMT_DURATION_FROM_STREAM, ///< Duration estimated from a stream with a known duration
+    AVFMT_DURATION_FROM_BITRATE ///< Duration estimated from bitrate (less accurate)
+};
+
 /**
  * Format I/O context.
  * New fields can be added to the end with minor version bumps.
@@ -1108,11 +1119,7 @@ typedef struct AVFormatContext {
      * The duration field can be estimated through various ways, and this field can be used
      * to know how the duration was estimated.
      */
-    enum {
-        AVFMT_DURATION_FROM_PTS,    ///< duration accurately estimated from PTSes
-        AVFMT_DURATION_FROM_STREAM, ///< duration estimated from a stream with a known duration
-        AVFMT_DURATION_FROM_BITRATE ///< duration estimated from bitrate (less accurate)
-    } duration_estimation_method;
+    enum AVDurationEstimationMethod duration_estimation_method;
 } AVFormatContext;
 
 /**
@@ -1120,7 +1127,7 @@ typedef struct AVFormatContext {
  *
  * @return AVFMT_DURATION_FROM_PTS, AVFMT_DURATION_FROM_STREAM, or AVFMT_DURATION_FROM_BITRATE.
  */
-int av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx);
+enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx);
 
 typedef struct AVPacketList {
     AVPacket pkt;
diff --git a/libavformat/options.c b/libavformat/options.c
index 915581f..8548381 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -111,7 +111,7 @@ AVFormatContext *avformat_alloc_context(void)
     return ic;
 }
 
-int av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx)
+enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx)
 {
     return ctx->duration_estimation_method;
 }



More information about the ffmpeg-cvslog mailing list