From 17fff881e796980e2b9817f195e80fe2f2fd197a Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Fri, 24 Jun 2011 02:04:54 +0300 Subject: rtsp: Merge the AVOption lists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This eases adding options that are common for both. The AV_OPT_FLAG_EN/DECODING_PARAM still indicates whether they belong to the muxer or demuxer. Signed-off-by: Martin Storsjö --- libavformat/rtspenc.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'libavformat/rtspenc.c') diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c index faf76c0e19..e4e79cad03 100644 --- a/libavformat/rtspenc.c +++ b/libavformat/rtspenc.c @@ -33,20 +33,13 @@ #include "libavutil/intreadwrite.h" #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 }, -}; - static const AVClass rtsp_muxer_class = { .class_name = "RTSP muxer", .item_name = av_default_item_name, - .option = options, + .option = ff_rtsp_options, .version = LIBAVUTIL_VERSION_INT, }; -- cgit v1.2.3