movenc: Add RTP muxer/hinter options

Signed-off-by: Martin Storsjö <martin@martin.st>

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index ccd39ffa84ebac8e22efcafb2dbf8ca246d419ab..dcc55814434314c6b2a1f04326a3fa94bbe59e6b 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -34,6 +34,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/opt.h"
 #include "libavutil/dict.h"
+#include "rtpenc.h"
 
 #undef NDEBUG
 #include <assert.h>
@@ -41,6 +42,7 @@
 static const AVOption options[] = {
     { "movflags", "MOV muxer flags", offsetof(MOVMuxContext, flags), FF_OPT_TYPE_FLAGS, {.dbl = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
     { "rtphint", "Add RTP hint tracks", 0, FF_OPT_TYPE_CONST, {.dbl = FF_MOV_FLAG_RTP_HINT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
+    FF_RTP_FLAG_OPTS(MOVMuxContext, rtp_flags),
     { NULL },
 };
 

diff --git a/libavformat/movenc.h b/libavformat/movenc.h
index 69b662171142639e7fa761b6a172327c0ef2b7a0..39cdb39284eed84c6595a4e2a0b1ed01b1d17789 100644 (file)
--- a/libavformat/movenc.h
+++ b/libavformat/movenc.h
@@ -111,6 +111,7 @@ typedef struct MOVMuxContext {
     MOVTrack *tracks;
 
     int flags;
+    int rtp_flags;
 } MOVMuxContext;
 
 #define FF_MOV_FLAG_RTP_HINT 1

diff --git a/libavformat/version.h b/libavformat/version.h
index bd7f3c0e4826b47915ce55828158b9ce9f052254..83fa43124684ada8972a1ce3706f7c7046a35dbe 100644 (file)
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -25,7 +25,7 @@
 
 #define LIBAVFORMAT_VERSION_MAJOR 53
 #define LIBAVFORMAT_VERSION_MINOR  1
-#define LIBAVFORMAT_VERSION_MICRO  2
+#define LIBAVFORMAT_VERSION_MICRO  3
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \