[FFmpeg-cvslog] rtspenc: Add RTP muxer options

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sat May 21 15:03:48 2011 +0300| [e2e29c62476f7d8f8851d0d51809ce2a152362f5] | committer: Martin Storsjö

rtspenc: Add RTP muxer options

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

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

 libavformat/rtsp.h    |    5 +++++
 libavformat/rtspenc.c |    2 ++
 libavformat/version.h |    2 +-
 3 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
index f5a7fad..5eae6bf 100644
--- a/libavformat/rtsp.h
+++ b/libavformat/rtsp.h
@@ -344,6 +344,11 @@ typedef struct RTSPState {
      * Do not begin to play the stream immediately.
      */
     int initial_pause;
+
+    /**
+     * Option flags for the chained RTP muxer.
+     */
+    int rtp_muxer_flags;
 } RTSPState;
 
 /**
diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c
index b7fa330..b76b6ad 100644
--- a/libavformat/rtspenc.c
+++ b/libavformat/rtspenc.c
@@ -34,10 +34,12 @@
 #include "libavutil/avstring.h"
 #include "url.h"
 #include "libavutil/opt.h"
+#include "rtpenc.h"
 
 #define SDP_MAX_SIZE 16384
 
 static const AVOption options[] = {
+    FF_RTP_FLAG_OPTS(RTSPState, rtp_muxer_flags),
     { NULL },
 };
 
diff --git a/libavformat/version.h b/libavformat/version.h
index ca61ab1..bd7f3c0 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  1
+#define LIBAVFORMAT_VERSION_MICRO  2
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \