From 279ae1cd72a17a697af8f71a987ac89ee4aa9107 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 26 Sep 2012 15:24:00 +0200
Subject: [PATCH] lavf: move fields that appear to be intended as public API to
the correct section
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavformat/avformat.h | 23 +++++++++++++++--------
libavformat/version.h | 2 +-
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index de53c26ee56..f7779e7808d 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1129,6 +1129,21 @@ typedef struct AVFormatContext {
*/
int avoid_negative_ts;
+ /**
+ * avio flags, used to force AVIO_FLAG_DIRECT.
+ * - encoding: unused
+ * - decoding: Set by user via AVOptions (NO direct access)
+ */
+ int avio_flags;
+
+ /**
+ * The duration field can be estimated through various ways, and this field can be used
+ * to know how the duration was estimated.
+ * - encoding: unused
+ * - decoding: Read by user via AVOptions (NO direct access)
+ */
+ enum AVDurationEstimationMethod duration_estimation_method;
+
/*****************************************************************
* All fields below this line are not part of the public API. They
* may not be used outside of libavformat and can be changed and
@@ -1166,14 +1181,6 @@ typedef struct AVFormatContext {
*/
#define RAW_PACKET_BUFFER_SIZE 2500000
int raw_packet_buffer_remaining_size;
-
- int avio_flags;
-
- /**
- * The duration field can be estimated through various ways, and this field can be used
- * to know how the duration was estimated.
- */
- enum AVDurationEstimationMethod duration_estimation_method;
} AVFormatContext;
/**
diff --git a/libavformat/version.h b/libavformat/version.h
index ee1772465eb..26cbbcfe422 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 54
#define LIBAVFORMAT_VERSION_MINOR 29
-#define LIBAVFORMAT_VERSION_MICRO 103
+#define LIBAVFORMAT_VERSION_MICRO 104
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
--
GitLab