Commit 52bf4ad6 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '0034314a'

* commit '0034314a':
  rtmp: Always call rtmp_close() on rtmp_open() failure
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents fa040c22 0034314a
......@@ -2824,11 +2824,10 @@ reconnect:
}
if (rt->is_input) {
int err;
// generate FLV header for demuxer
rt->flv_size = 13;
if ((err = av_reallocp(&rt->flv_data, rt->flv_size)) < 0)
return err;
if ((ret = av_reallocp(&rt->flv_data, rt->flv_size)) < 0)
goto fail;
rt->flv_off = 0;
memcpy(rt->flv_data, "FLV\1\0\0\0\0\011\0\0\0\0", rt->flv_size);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment