diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 23:48:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 23:48:21 +0200 |
| commit | 52bf4ad6746a38f3e37b9ca8d579be7c448159cc (patch) | |
| tree | 73c2bc4910d5b57556f66dc21491a9ce31257ee5 /libavformat/rtmpproto.c | |
| parent | fa040c224703a51d8a07ec33354ab47d275c0493 (diff) | |
| parent | 0034314a69e76a53534a74cceef865cfcb7b42cc (diff) | |
| download | ffmpeg-52bf4ad6746a38f3e37b9ca8d579be7c448159cc.tar.gz | |
Merge commit '0034314a69e76a53534a74cceef865cfcb7b42cc'
* commit '0034314a69e76a53534a74cceef865cfcb7b42cc':
rtmp: Always call rtmp_close() on rtmp_open() failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 286e9e8156..3647acdf2e 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -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); |