RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtpenc_chain: Free the URLContext on failure 

If an URLContext is passed in, its ownership is given to this
function, and is either owned by the returned AVFormatContext
on a successful return, or freed on failure.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2012-05-26 00:40:54 +03:00
parent 2dcb21a95d
commit 93cef6f923
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/rtpenc_chain.c
View File

@ -28,25 +28,23 @@
AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st, AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st,
URLContext *handle, int packet_size) URLContext *handle, int packet_size)
{ {
AVFormatContext *rtpctx; AVFormatContext *rtpctx = NULL;
int ret; int ret;
AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL); AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL);
uint8_t *rtpflags; uint8_t *rtpflags;
AVDictionary *opts = NULL; AVDictionary *opts = NULL;
if (!rtp_format) if (!rtp_format)
return NULL; goto fail;
/* Allocate an AVFormatContext for each output stream */ /* Allocate an AVFormatContext for each output stream */
rtpctx = avformat_alloc_context(); rtpctx = avformat_alloc_context();
if (!rtpctx) if (!rtpctx)
return NULL; goto fail;
rtpctx->oformat = rtp_format; rtpctx->oformat = rtp_format;
if (!avformat_new_stream(rtpctx, NULL)) { if (!avformat_new_stream(rtpctx, NULL))
av_free(rtpctx); goto fail;
return NULL;
}
/* Pass the interrupt callback on */ /* Pass the interrupt callback on */
rtpctx->interrupt_callback = s->interrupt_callback; rtpctx->interrupt_callback = s->interrupt_callback;
/* Copy the max delay setting; the rtp muxer reads this. */ /* Copy the max delay setting; the rtp muxer reads this. */
@ -82,4 +80,10 @@ AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st,
} }
return rtpctx; return rtpctx;
fail:
av_free(rtpctx);
if (handle)
ffurl_close(handle);
return NULL;
} }