[FFmpeg-cvslog] librtmp: append the correct field to the string
Vittorio Giovara
git at videolan.org
Sun Jan 18 02:50:10 CET 2015
ffmpeg | branch: release/2.4 | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Nov 17 00:22:22 2014 +0100| [29e720da76ca353dbda9f881562902b41c355b77] | committer: Luca Barbato
librtmp: append the correct field to the string
Also prevent a NULL pointer dereference.
CC: libav-stable at libav.org
Bug-Id: CID 1250329 / CID 1250331
(cherry picked from commit a28468d0daf4be14761c16a3ddd33266b2380123)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29e720da76ca353dbda9f881562902b41c355b77
---
libavformat/librtmp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c
index 74e2c49..fac3a35 100644
--- a/libavformat/librtmp.c
+++ b/libavformat/librtmp.c
@@ -169,7 +169,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
}
if (ctx->swfurl) {
av_strlcat(filename, " swfUrl=", len);
- av_strlcat(filename, ctx->pageurl, len);
+ av_strlcat(filename, ctx->swfurl, len);
}
if (ctx->flashver) {
av_strlcat(filename, " flashVer=", len);
More information about the ffmpeg-cvslog
mailing list