From e2e29c62476f7d8f8851d0d51809ce2a152362f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sat, 21 May 2011 15:03:48 +0300 Subject: [PATCH] rtspenc: Add RTP muxer options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/rtsp.h | 5 +++++ libavformat/rtspenc.c | 2 ++ libavformat/version.h | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index f5a7fada21..5eae6bf4f3 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 b7fa330f53..b76b6adb99 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 ca61ab165f..bd7f3c0e48 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, \