diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 13:53:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 13:53:17 +0200 |
| commit | d32eec3359da9019fe8b4994397d16001433ce40 (patch) | |
| tree | bec889c3f0afdb91f36259c7f5aeab2fbce3d725 /libavformat/rtmpproto.c | |
| parent | 373d15525d3de87f419f87c4c69b32c265a47310 (diff) | |
| parent | 4d6d70292e91a7ef027824d731b6b6570ceabf2f (diff) | |
| download | ffmpeg-d32eec3359da9019fe8b4994397d16001433ce40.tar.gz | |
Merge commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f'
* commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f':
rtmpproto: Pass the 'live' parameter in the right unit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index bbc6ad7cb1..223ec6ca4e 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -703,7 +703,7 @@ static int gen_play(URLContext *s, RTMPContext *rt) ff_amf_write_number(&p, ++rt->nb_invokes); ff_amf_write_null(&p); ff_amf_write_string(&p, rt->playpath); - ff_amf_write_number(&p, rt->live); + ff_amf_write_number(&p, rt->live * 1000); return rtmp_send_packet(rt, &pkt, 1); } |