diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-02 14:59:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-02 14:59:42 +0200 |
| commit | 5e253fdfc1a4e727628243580c1c3d589c1951f1 (patch) | |
| tree | f5dbde1d9a1b2dd15631d3cc15c39d45cf0aa0d8 | |
| parent | c28bca2bdef6c4671c25b1c0b25c489f11ffad80 (diff) | |
| parent | 628a17d78ac1d95d83482b0c333c03bdb1fffbe9 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: alias rtmp_listen to listen
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtmpproto.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 9bccd92088..6246ba6173 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -2769,6 +2769,7 @@ static const AVOption rtmp_options[] = { {"rtmp_swfverify", "URL to player swf file, compute hash/size automatically.", OFFSET(swfverify), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC}, {"rtmp_tcurl", "URL of the target stream. Defaults to proto://host[:port]/app.", OFFSET(tcurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, {"rtmp_listen", "Listen for incoming rtmp connections", OFFSET(listen), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC, "rtmp_listen" }, + {"listen", "Listen for incoming rtmp connections", OFFSET(listen), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC, "rtmp_listen" }, {"timeout", "Maximum timeout (in seconds) to wait for incoming connections. -1 is infinite. Implies -rtmp_listen 1", OFFSET(listen_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC, "rtmp_listen" }, { NULL }, }; |