[SCM] libav/experimental: rtmpproto: rename URLContext* argument in rtmp_write()
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:23:07 UTC 2013
The following commit has been merged in the experimental branch:
commit 9ad4c65f6fa7ff6d3fb7d5ea02908bbd6adc583f
Author: Anton Khirnov <anton at khirnov.net>
Date: Thu Feb 3 11:17:35 2011 +0000
rtmpproto: rename URLContext* argument in rtmp_write()
Now the first argument is URLContext *h. However, the function logs to
LOG_CONTEXT, which is #defined as 's' for new lavf major versions.
Therefore, rename h -> s.
Signed-off-by: Mans Rullgard <mans at mansr.com>
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 3ad49d6..748aab3 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -923,9 +923,9 @@ static int rtmp_read(URLContext *s, uint8_t *buf, int size)
return orig_size;
}
-static int rtmp_write(URLContext *h, const uint8_t *buf, int size)
+static int rtmp_write(URLContext *s, const uint8_t *buf, int size)
{
- RTMPContext *rt = h->priv_data;
+ RTMPContext *rt = s->priv_data;
int size_temp = size;
int pktsize, pkttype;
uint32_t ts;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list