summaryrefslogtreecommitdiff
path: root/libavformat/rtspdec.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-06-24 02:04:54 +0300
committerMartin Storsjö <martin@martin.st>2011-10-17 19:57:45 +0300
commit17fff881e796980e2b9817f195e80fe2f2fd197a (patch)
tree4820b4a555aa242140b9ea288e557bfe41980676 /libavformat/rtspdec.c
parentb157be1f383e55f86324dae11e90a7b59173eec1 (diff)
rtsp: Merge the AVOption lists
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ö <martin@martin.st>
Diffstat (limited to 'libavformat/rtspdec.c')
-rw-r--r--libavformat/rtspdec.c8
1 files changed, 1 insertions, 7 deletions
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,
};