[FFmpeg-cvslog] movenc: Add RTP muxer/hinter options

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sat May 21 14:58:43 2011 +0300| [d16cccac98a250d53827fa0c82e429bf17070d0f] | committer: Martin Storsjö

movenc: Add RTP muxer/hinter options

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

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

 libavformat/movenc.c  |    2 ++
 libavformat/movenc.h  |    1 +
 libavformat/version.h |    2 +-
 3 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index ccd39ff..dcc5581 100644
--- 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 69b6621..39cdb39 100644
--- 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 bd7f3c0..83fa431 100644
--- 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, \