From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Sun, 16 Nov 2014 23:22:22 +0000 (+0100)
Subject: librtmp: append the correct field to the string
X-Git-Tag: v11.4~71
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29e720da76ca353dbda9f881562902b41c355b77;p=platform%2Fupstream%2Flibav.git

librtmp: append the correct field to the string

Also prevent a NULL pointer dereference.

CC: libav-stable@libav.org
Bug-Id: CID 1250329 / CID 1250331
(cherry picked from commit a28468d0daf4be14761c16a3ddd33266b2380123)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
---

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);