movenc: remove uses of deprecated API.

[ffmpeg] / libavformat / nut.h

diff --git a/libavformat/nut.h b/libavformat/nut.h
index a1081ed34cbed5903d1df7f68e0473e8d6740b05..7013fb126a551ca6f5047759b21e7063df498a43 100644 (file)
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -27,6 +27,7 @@
 //#include "libavcodec/mpegaudio.h"
 #include "avformat.h"
 #include "riff.h"
+#include "metadata.h"
 
 #define      MAIN_STARTCODE (0x7A561F5F04ADULL + (((uint64_t)('N'<<8) + 'M')<<48))
 #define    STREAM_STARTCODE (0x11405BF2F9DBULL + (((uint64_t)('N'<<8) + 'S')<<48))
@@ -98,6 +99,7 @@ typedef struct {
 } NUTContext;
 
 extern const AVCodecTag ff_nut_subtitle_tags[];
+extern const AVCodecTag ff_nut_video_tags[];
 
 typedef struct {
     char str[9];
@@ -106,10 +108,13 @@ typedef struct {
 
 void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val);
 int64_t ff_lsb2full(StreamContext *stream, int64_t lsb);
-int ff_nut_sp_pos_cmp(Syncpoint *a, Syncpoint *b);
-int ff_nut_sp_pts_cmp(Syncpoint *a, Syncpoint *b);
+int ff_nut_sp_pos_cmp(const Syncpoint *a, const Syncpoint *b);
+int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b);
 void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts);
+void ff_nut_free_sp(NUTContext *nut);
 
 extern const Dispositions ff_nut_dispositions[];
 
+extern const AVMetadataConv ff_nut_metadata_conv[];
+
 #endif /* AVFORMAT_NUT_H */