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/rtsp.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavformat/rtsp.h') diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 62ca483d9d..5327b00679 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -29,6 +29,7 @@ #include "httpauth.h" #include "libavutil/log.h" +#include "libavutil/opt.h" /** * Network layer over which RTP/etc packet data will be transported. @@ -537,4 +538,6 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, */ void ff_rtsp_undo_setup(AVFormatContext *s); +extern const AVOption ff_rtsp_options[]; + #endif /* AVFORMAT_RTSP_H */ -- cgit v1.2.3