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/rtspdec.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'libavformat/rtspdec.c') diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index ccabca9377..c453b82195 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -22,7 +22,6 @@ #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" -#include "libavutil/opt.h" #include "avformat.h" #include "internal.h" @@ -388,15 +387,10 @@ static int rtsp_read_close(AVFormatContext *s) return 0; } -static const AVOption options[] = { - { "initial_pause", "Don't start playing the stream immediately", offsetof(RTSPState, initial_pause), AV_OPT_TYPE_INT, {.dbl = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, - { NULL }, -}; - const AVClass rtsp_demuxer_class = { .class_name = "RTSP demuxer", .item_name = av_default_item_name, - .option = options, + .option = ff_rtsp_options, .version = LIBAVUTIL_VERSION_INT, }; -- cgit v1.2.3