[FFmpeg-cvslog] avformat/internal: Fix warning about struct declaration

Michael Niedermayer git at videolan.org
Tue May 12 04:19:04 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 12 03:20:49 2015 +0200| [59db9e69496258f63fae618638a2649cf302d2b6] | committer: Michael Niedermayer

avformat/internal: Fix warning about struct declaration

Moving ffio_open2_wrapper() to internal as it uses AVFormatContext

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/avio_internal.h |    3 ---
 libavformat/internal.h      |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h
index c354771..1ed5831 100644
--- a/libavformat/avio_internal.h
+++ b/libavformat/avio_internal.h
@@ -157,7 +157,4 @@ int ffio_close_null_buf(AVIOContext *s);
  */
 void ffio_free_dyn_buf(AVIOContext **s);
 
-int ffio_open2_wrapper(struct AVFormatContext *s, AVIOContext **pb, const char *url, int flags,
-                       const AVIOInterruptCB *int_cb, AVDictionary **options);
-
 #endif /* AVFORMAT_AVIO_INTERNAL_H */
diff --git a/libavformat/internal.h b/libavformat/internal.h
index c8d2354..d665cbd 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -487,4 +487,7 @@ enum AVWriteUncodedFrameFlags {
  */
 int ff_copy_whitelists(AVFormatContext *dst, AVFormatContext *src);
 
+int ffio_open2_wrapper(struct AVFormatContext *s, AVIOContext **pb, const char *url, int flags,
+                       const AVIOInterruptCB *int_cb, AVDictionary **options);
+
 #endif /* AVFORMAT_INTERNAL_H */



More information about the ffmpeg-cvslog mailing list