[FFmpeg-cvslog] rtmpproto: rename URLContext* argument in rtmp_write()

Anton Khirnov git
Fri Feb 4 03:37:02 CET 2011


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Feb  3 11:17:35 2011 +0000| [ea46876301e32ee6e55e05a1289cc226e434bdd0] | committer: Michael Niedermayer

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>
(cherry picked from commit 9ad4c65f6fa7ff6d3fb7d5ea02908bbd6adc583f)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea46876301e32ee6e55e05a1289cc226e434bdd0
---

 libavformat/rtmpproto.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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;




More information about the ffmpeg-cvslog mailing list