diff options
| author | Martin Storsjö <martin@martin.st> | 2011-05-21 15:03:48 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2011-06-10 10:52:22 +0300 |
| commit | e2e29c62476f7d8f8851d0d51809ce2a152362f5 (patch) | |
| tree | de08d1a88ffc18454c3802bd42ae23176f159132 | |
| parent | 6cf09bb7ef5a52b9d9b589067d94a5c80f9fe848 (diff) | |
| download | ffmpeg-e2e29c62476f7d8f8851d0d51809ce2a152362f5.tar.gz | |
rtspenc: Add RTP muxer options
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/rtsp.h | 5 | ||||
| -rw-r--r-- | libavformat/rtspenc.c | 2 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 8 insertions, 1 deletions
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, \ |