Cleanup prev commits

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@249 400ebc74-4327-4243-bc38-086b20814532

diff --git a/hashswf.c b/hashswf.c
index 64d17855bd6879eba2aa44a8a3fdc7918389fa14..fd2b2bcb7cc6362aaaf03ee1ea73ff3101dc2f2b 100644 (file)
--- a/hashswf.c
+++ b/hashswf.c
@@ -88,7 +88,7 @@ swfcrunch(void *ptr, size_t size, size_t nmemb, void *stream)
 #define        AGENT   "Mozilla/5.0"
 
 HTTPResult
-http_get(struct http_ctx *http, const char *url, http_read_callback cb)
+HTTP_get(struct HTTP_ctx *http, const char *url, HTTP_read_callback *cb)
 {
   char *host, *path;
   char *p1, *p2;
@@ -355,7 +355,7 @@ RTMP_HashSWF(const char *url, unsigned int *size, unsigned char *hash, int age)
   int i, got = 0, ret = 0;
   unsigned int hlen;
   struct info in = {0};
-  struct http_ctx http = {0};
+  struct HTTP_ctx http = {0};
   HTTPResult httpres;
   z_stream zs = {0};
   HMAC_CTX ctx;
@@ -470,7 +470,7 @@ RTMP_HashSWF(const char *url, unsigned int *size, unsigned char *hash, int age)
   http.date = date;
   http.data = ∈
 
-  httpres = http_get(&http, url, swfcrunch);
+  httpres = HTTP_get(&http, url, swfcrunch);
 
   inflateEnd(&zs);
 

diff --git a/http.h b/http.h
index ece60c5f3ff9d1faa722cac60661359e4f02bf0f..83ebdfb011f05b0f77b6b90810df2d1e7fe3ed32 100644 (file)
--- a/http.h
+++ b/http.h
@@ -1,10 +1,7 @@
 #ifndef __HTTP_H__
 #define __HTTP_H__
 /*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *      Copyright (C) 2008-2009 Andrej Stepanchuk
- *      Copyright (C) 2009-2010 Howard Chu
+ *      Copyright (C) 2010 Howard Chu
  *      Copyright (C) 2010 Antti Ajanki
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -34,15 +31,15 @@ typedef enum {
   HTTPRES_LOST_CONNECTION,  /* connection lost while waiting for data */
 } HTTPResult;
 
-struct http_ctx {
+struct HTTP_ctx {
   char *date;
   int size;
   int status;
   void *data;
 };
 
-typedef size_t (*http_read_callback)(void *ptr, size_t size, size_t nmemb, void *stream);
+typedef size_t (HTTP_read_callback)(void *ptr, size_t size, size_t nmemb, void *stream);
 
-HTTPResult http_get(struct http_ctx *http, const char *url, http_read_callback cb);
+HTTPResult HTTP_get(struct HTTP_ctx *http, const char *url, HTTP_read_callback *cb);
 
 #endif

diff --git a/rtmp.c b/rtmp.c
index 117bfefc99a6a9e19e46ba9dc946c9111b7b8251..490e3201c1d5cf97c747497d51f625b77c7682b6 100644 (file)
--- a/rtmp.c
+++ b/rtmp.c
@@ -494,7 +494,7 @@ RTMP_ConnectStream(RTMP * r, double seekTime, uint32_t dLength)
              (packet.m_packetType == RTMP_PACKET_TYPE_INFO))
            {
              Log(LOGWARNING, "Received FLV packet before play()! Ignoring.");
-               RTMPPacket_Free(&packet);
+             RTMPPacket_Free(&packet);
              continue;
            }