[1/2] rtsp: Make the rtsp flags avoptions set via a define

Message ID 1318874895-89573-1-git-send-email-martin@martin.st
State Committed
Commit 3a6765fb5d263f1b16be57d5564678147ba7f438
Headers show

Commit Message

Martin Storsjö Oct. 17, 2011, 6:08 p.m.
This helps sharing these options with the sdp and rtp demuxers.
---
 libavformat/rtsp.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Comments

Anton Khirnov Oct. 17, 2011, 6:57 p.m. | #1
On Mon, 17 Oct 2011 21:08:14 +0300, Martin Storsjö <martin@martin.st> wrote:
> This helps sharing these options with the sdp and rtp demuxers.
> ---
>  libavformat/rtsp.c |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 

LGTM

Patch

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index afd8e77..4765d2f 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -60,6 +60,11 @@ 
 #define OFFSET(x) offsetof(RTSPState, x)
 #define DEC AV_OPT_FLAG_DECODING_PARAM
 #define ENC AV_OPT_FLAG_ENCODING_PARAM
+
+#define RTSP_FLAG_OPTS(name, longname) \
+    { name, longname, OFFSET(rtsp_flags), AV_OPT_TYPE_FLAGS, {0}, INT_MIN, INT_MAX, DEC, "rtsp_flags" }, \
+    { "filter_src", "Only receive packets from the negotiated peer IP", 0, AV_OPT_TYPE_CONST, {RTSP_FLAG_FILTER_SRC}, 0, 0, DEC, "rtsp_flags" }
+
 const AVOption ff_rtsp_options[] = {
     { "initial_pause",  "Don't start playing the stream immediately", OFFSET(initial_pause), AV_OPT_TYPE_INT, {0}, 0, 1, DEC },
     FF_RTP_FLAG_OPTS(RTSPState, rtp_muxer_flags),
@@ -68,8 +73,7 @@  const AVOption ff_rtsp_options[] = {
     { "tcp", "TCP", 0, AV_OPT_TYPE_CONST, {1 << RTSP_LOWER_TRANSPORT_TCP}, 0, 0, DEC|ENC, "rtsp_transport" }, \
     { "udp_multicast", "UDP multicast", 0, AV_OPT_TYPE_CONST, {1 << RTSP_LOWER_TRANSPORT_UDP_MULTICAST}, 0, 0, DEC, "rtsp_transport" },
     { "http", "HTTP tunneling", 0, AV_OPT_TYPE_CONST, {(1 << RTSP_LOWER_TRANSPORT_HTTP)}, 0, 0, DEC, "rtsp_transport" },
-    { "rtsp_flags", "RTSP flags", OFFSET(rtsp_flags), AV_OPT_TYPE_FLAGS, {0}, INT_MIN, INT_MAX, DEC, "rtsp_flags" },
-    { "filter_src", "Only receive packets from the negotiated peer IP", 0, AV_OPT_TYPE_CONST, {RTSP_FLAG_FILTER_SRC}, 0, 0, DEC, "rtsp_flags" },
+    RTSP_FLAG_OPTS("rtsp_flags", "RTSP flags"),
     { NULL },
 };