virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

rtsp: Merge the AVOption lists

Browse Source 
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>
This commit is contained in:
Martin Storsjö
2011-06-24 02:04:54 +03:00
parent b157be1f38
commit 17fff881e7
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/rtsp.c
View File

@@ -45,6 +45,7 @@
#include "rtpdec_formats.h" #include "rtpdec_formats.h"
#include "rtpenc_chain.h" #include "rtpenc_chain.h"
#include "url.h" #include "url.h"
#include "rtpenc.h"
//#define DEBUG //#define DEBUG
@@ -56,6 +57,12 @@
#define SDP_MAX_SIZE 16384 #define SDP_MAX_SIZE 16384
#define RECVBUF_SIZE 10 * RTP_MAX_PACKET_LENGTH #define RECVBUF_SIZE 10 * RTP_MAX_PACKET_LENGTH
const AVOption ff_rtsp_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 },
FF_RTP_FLAG_OPTS(RTSPState, rtp_muxer_flags),
{ NULL },
};
static void get_word_until_chars(char *buf, int buf_size, static void get_word_until_chars(char *buf, int buf_size,
const char *sep, const char **pp) const char *sep, const char **pp)
{ {

3
libavformat/rtsp.h
View File

@@ -29,6 +29,7 @@
#include "httpauth.h" #include "httpauth.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h"
/** /**
* Network layer over which RTP/etc packet data will be transported. * 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); void ff_rtsp_undo_setup(AVFormatContext *s);
extern const AVOption ff_rtsp_options[];
#endif /* AVFORMAT_RTSP_H */ #endif /* AVFORMAT_RTSP_H */

8
libavformat/rtspdec.c
View File

@@ -22,7 +22,6 @@
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/opt.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
@@ -388,15 +387,10 @@ static int rtsp_read_close(AVFormatContext *s)
return 0; 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 = { const AVClass rtsp_demuxer_class = {
.class_name = "RTSP demuxer", .class_name = "RTSP demuxer",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = ff_rtsp_options,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };

9
libavformat/rtspenc.c
View File

@@ -33,20 +33,13 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "url.h" #include "url.h"
#include "libavutil/opt.h"
#include "rtpenc.h"
#define SDP_MAX_SIZE 16384 #define SDP_MAX_SIZE 16384
static const AVOption options[] = {
FF_RTP_FLAG_OPTS(RTSPState, rtp_muxer_flags),
{ NULL },
};
static const AVClass rtsp_muxer_class = { static const AVClass rtsp_muxer_class = {
.class_name = "RTSP muxer", .class_name = "RTSP muxer",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = ff_rtsp_options,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };