aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtmpproto.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-02-03 11:17:35 +0000
committerMichael Niedermayer <michaelni@gmx.at>2011-02-04 03:10:12 +0100
commitea46876301e32ee6e55e05a1289cc226e434bdd0 (patch)
tree3bdf6e234ecc63750578aba6b98ea07f80640da9 /libavformat/rtmpproto.c
parentb9dab1131c7bf3c5093fb9ce475b3b92480d7669 (diff)
downloadffmpeg-ea46876301e32ee6e55e05a1289cc226e434bdd0.tar.gz
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@mansr.com> (cherry picked from commit 9ad4c65f6fa7ff6d3fb7d5ea02908bbd6adc583f)
Diffstat (limited to 'libavformat/rtmpproto.c')
-rw-r--r--libavformat/rtmpproto.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 3ad49d6234..748aab33cc 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;