[FFmpeg-devel] [PATCH] avio: move ff_rewind_with_probe_data from avio.h to avio_internal.h

[Anton Khirnov]

also change its prefix to ffio
---
 libavformat/avio.h          |   15 ---------------
 libavformat/avio_internal.h |   14 ++++++++++++++
 libavformat/aviobuf.c       |    2 +-
 libavformat/utils.c         |    3 ++-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/libavformat/avio.h b/libavformat/avio.h
index f690e10..866c3c8 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -603,21 +603,6 @@ int url_resetbuf(AVIOContext *s, int flags);
 #endif
 
 /**
- * Rewind the AVIOContext using the specified buffer containing the first buf_size bytes of the file.
- * Used after probing to avoid seeking.
- * Joins buf and s->buffer, taking any overlap into consideration.
- * @note s->buffer must overlap with buf or they can't be joined and the function fails
- * @note This function is NOT part of the public API
- *
- * @param s The read-only AVIOContext to rewind
- * @param buf The probe buffer containing the first buf_size bytes of the file
- * @param buf_size The size of buf
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int ff_rewind_with_probe_data(AVIOContext *s, unsigned char *buf, int buf_size);
-
-/**
  * Create and initialize a AVIOContext for accessing the
  * resource indicated by url.
  * @note When the resource indicated by url has been opened in
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h
index 31335ef..e089e47 100644
--- a/libavformat/avio_internal.h
+++ b/libavformat/avio_internal.h
@@ -49,4 +49,18 @@ static av_always_inline void ffio_wfourcc(AVIOContext *pb, const uint8_t *s)
 
 uint64_t ff_get_v(AVIOContext *bc);
 
+/**
+ * Rewind the AVIOContext using the specified buffer containing the first buf_size bytes of the file.
+ * Used after probing to avoid seeking.
+ * Joins buf and s->buffer, taking any overlap into consideration.
+ * @note s->buffer must overlap with buf or they can't be joined and the function fails
+ *
+ * @param s The read-only AVIOContext to rewind
+ * @param buf The probe buffer containing the first buf_size bytes of the file
+ * @param buf_size The size of buf
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code in case of failure
+ */
+int ffio_rewind_with_probe_data(AVIOContext *s, unsigned char *buf, int buf_size);
+
 #endif // AVFORMAT_AVIO_INTERNAL_H
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index b118683..25b5acf 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -841,7 +841,7 @@ static int url_resetbuf(AVIOContext *s, int flags)
     return 0;
 }
 
-int ff_rewind_with_probe_data(AVIOContext *s, unsigned char *buf, int buf_size)
+int ffio_rewind_with_probe_data(AVIOContext *s, unsigned char *buf, int buf_size)
 {
     int64_t buffer_start;
     int buffer_size;
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 1268be3..aaa2cdd 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
+#include "avio_internal.h"
 #include "internal.h"
 #include "libavcodec/internal.h"
 #include "libavutil/opt.h"
@@ -585,7 +586,7 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
     }
 
     /* rewind. reuse probe buffer to avoid seeking */
-    if ((ret = ff_rewind_with_probe_data(pb, buf, pd.buf_size)) < 0)
+    if ((ret = ffio_rewind_with_probe_data(pb, buf, pd.buf_size)) < 0)
         av_free(buf);
 
     return ret;
-- 
1.7.4.1