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

Merge commit '865461099e062de5a3a109c2a5be98004c11d8bd' 

* commit '865461099e062de5a3a109c2a5be98004c11d8bd':
  librtmp: Don't free the temp url at the end of rtmp_open

Conflicts:
	libavformat/librtmp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-06 19:12:52 +02:00
parent e592bf3d2f 865461099e
commit 1c8c4b8a89
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/librtmp.c
View File

@ -47,6 +47,7 @@ typedef struct LibRTMPContext {
char *pageurl; char *pageurl;
char *client_buffer_time; char *client_buffer_time;
int live; int live;
char *temp_filename;
} LibRTMPContext; } LibRTMPContext;
static void rtmp_log(int level, const char *fmt, va_list args) static void rtmp_log(int level, const char *fmt, va_list args)
@ -71,6 +72,7 @@ static int rtmp_close(URLContext *s)
RTMP *r = &ctx->rtmp; RTMP *r = &ctx->rtmp;
RTMP_Close(r); RTMP_Close(r);
av_freep(&ctx->temp_filename);
return 0; return 0;
} }
@ -149,7 +151,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
len += strlen(ctx->swfurl); len += strlen(ctx->swfurl);
} }
if (!(filename = av_malloc(len))) if (!(ctx->temp_filename = filename = av_malloc(len)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
av_strlcpy(filename, s->filename, len); av_strlcpy(filename, s->filename, len);
@ -229,10 +231,9 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
} }
s->is_streamed = 1; s->is_streamed = 1;
rc = 0; return 0;
fail: fail:
if (filename != s->filename) av_freep(&ctx->temp_filename);
av_freep(&filename);
if (rc) if (rc)
RTMP_Close(r); RTMP_Close(r);