[FFmpeg-cvslog] lavf: move avpriv function definition to internal.h
Josh de Kock
git at videolan.org
Mon Apr 2 04:20:21 EEST 2018
ffmpeg | branch: master | Josh de Kock <josh at itanimul.li> | Sun Apr 1 00:20:59 2018 +0100| [42d26145e9561d0e7cc700b79be9e34caf449ecc] | committer: Josh de Kock
lavf: move avpriv function definition to internal.h
Signed-off-by: Josh de Kock <josh at itanimul.li>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42d26145e9561d0e7cc700b79be9e34caf449ecc
---
libavdevice/alldevices.c | 1 +
libavformat/allformats.c | 1 +
libavformat/avformat.h | 2 --
libavformat/internal.h | 1 +
4 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index ebf95f8a81..adde749ce1 100644
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -20,6 +20,7 @@
#include "config.h"
#include "libavutil/thread.h"
+#include "libavformat/internal.h"
#include "avdevice.h"
/* devices */
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 2a20548c95..7ade03fc5d 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -20,6 +20,7 @@
*/
#include "libavutil/thread.h"
+#include "libavformat/internal.h"
#include "avformat.h"
#include "rtp.h"
#include "rdt.h"
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index ec4e5f45f5..a2fe7c6bb2 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -3060,8 +3060,6 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt,
*/
AVRational av_stream_get_codec_timebase(const AVStream *st);
-
-void avpriv_register_devices(const AVOutputFormat * const o[], const AVInputFormat * const i[]);
/**
* @}
*/
diff --git a/libavformat/internal.h b/libavformat/internal.h
index 619063097f..23eb7e8a7c 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -731,4 +731,5 @@ int ff_unlock_avformat(void);
*/
void ff_format_set_url(AVFormatContext *s, char *url);
+void avpriv_register_devices(const AVOutputFormat * const o[], const AVInputFormat * const i[]);
#endif /* AVFORMAT_INTERNAL_H */
More information about the ffmpeg-cvslog
mailing list