On Wed, May 9, 2012 at 11:41 AM, Martin Storsjö <mar...@martin.st> wrote:
> On Wed, 9 May 2012, Samuel Pitoiset wrote:
>
> ---
>> libavformat/rtmpproto.c | 8 ++++++++
>> 1 file changed, 8 insertions(+)
>>
>> diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
>> index e1c4beb..427655c 100644
>> --- a/libavformat/rtmpproto.c
>> +++ b/libavformat/rtmpproto.c
>> @@ -86,6 +86,7 @@ typedef struct RTMPContext {
>> int create_stream_invoke; ///< invoke id for the
>> create stream command
>> char* tcurl; ///< url of the target stream
>> char* flashver; ///< version of the flash
>> plugin
>> + char* swfurl; ///< url of the swf player
>> } RTMPContext;
>>
>> #define PLAYER_KEY_OPEN_PART_LEN 30 ///< length of partial key used for
>> first client digest signing
>> @@ -134,6 +135,12 @@ static void gen_connect(URLContext *s, RTMPContext
>> *rt)
>> }
>> ff_amf_write_field_name(&p, "flashVer");
>> ff_amf_write_string(&p, rt->flashver);
>> +
>> + if (rt->swfurl) {
>> + ff_amf_write_field_name(&p, "swfUrl");
>> + ff_amf_write_string(&p, rt->swfurl);
>> + }
>> +
>> ff_amf_write_field_name(&p, "tcUrl");
>> ff_amf_write_string(&p, rt->tcurl);
>> if (rt->is_input) {
>> @@ -1094,6 +1101,7 @@ static const AVOption rtmp_options[] = {
>> {"live", "live stream", 0, AV_OPT_TYPE_CONST, {-1}, 0, 0, DEC,
>> "rtmp_live"},
>> {"recorded", "recorded stream", 0, AV_OPT_TYPE_CONST, {0}, 0, 0, DEC,
>> "rtmp_live"},
>> {"rtmp_playpath", "Stream identifier to play or to publish",
>> OFFSET(playpath), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC},
>> + {"rtmp_swfurl", "URL of the SWF player. By default no value will be
>> sent", OFFSET(swfurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC},
>> {"rtmp_tcurl", "URL of the target stream. Defaults to
>> rtmp://host[:port]/app.", OFFSET(tcurl), AV_OPT_TYPE_STRING, {.str = NULL
>> }, 0, 0, DEC|ENC},
>> { NULL },
>> };
>> --
>> 1.7.10.1
>>
>
> All three of these look good to me.
>
Thanks for the review. ;)
>
> // Martin
> ______________________________**_________________
> libav-devel mailing list
> libav-devel@libav.org
> https://lists.libav.org/**mailman/listinfo/libav-devel<https://lists.libav.org/mailman/listinfo/libav-devel>
>
--
Best regards,
Samuel Pitoiset.
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
