fix alac decoder on little endian

[ffmpeg] / libavformat / http.c

diff --git a/libavformat/http.c b/libavformat/http.c
index 85b1f319bd595ad768ee772abaec366f233ac98d..cb6ba49e5080c545d90fcc2697a71bd71675283c 100644 (file)
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
 #include <unistd.h>
@@ -49,7 +49,7 @@ typedef struct {
 static int http_connect(URLContext *h, const char *path, const char *hoststr,
                         const char *auth);
 static int http_write(URLContext *h, uint8_t *buf, int size);
-static char *b64_encode( unsigned char *src );
+static char *b64_encode(const unsigned char *src );
 
 
 /* return non zero if error */
@@ -73,13 +73,13 @@ static int http_open(URLContext *h, const char *uri, int flags)
     h->priv_data = s;
 
     proxy_path = getenv("http_proxy");
-    use_proxy = (proxy_path != NULL) && !getenv("no_proxy") && 
+    use_proxy = (proxy_path != NULL) && !getenv("no_proxy") &&
         strstart(proxy_path, "http://", NULL);
 
     /* fill the dest addr */
  redo:
     /* needed in any case to build the host string */
-    url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, 
+    url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port,
               path1, sizeof(path1), uri);
     if (port > 0) {
         snprintf(hoststr, sizeof(hoststr), "%s:%d", hostname, port);
@@ -88,7 +88,7 @@ static int http_open(URLContext *h, const char *uri, int flags)
     }
 
     if (use_proxy) {
-        url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, 
+        url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port,
                   NULL, 0, proxy_path);
         path = uri;
     } else {
@@ -142,7 +142,7 @@ static int http_getc(HTTPContext *s)
 static int process_line(HTTPContext *s, char *line, int line_count)
 {
     char *tag, *p;
-    
+
     /* end of header */
     if (line[0] == '\0')
         return 0;
@@ -160,9 +160,9 @@ static int process_line(HTTPContext *s, char *line, int line_count)
     } else {
         while (*p != '\0' && *p != ':')
             p++;
-        if (*p != ':') 
+        if (*p != ':')
             return 1;
-        
+
         *p = '\0';
         tag = line;
         p++;
@@ -198,10 +198,10 @@ static int http_connect(URLContext *h, const char *path, const char *hoststr,
              LIBAVFORMAT_IDENT,
              hoststr,
              b64_encode(auth));
-    
+
     if (http_write(h, s->buffer, strlen(s->buffer)) < 0)
         return AVERROR_IO;
-        
+
     /* init input buffer */
     s->buf_ptr = s->buffer;
     s->buf_end = s->buffer;
@@ -211,7 +211,7 @@ static int http_connect(URLContext *h, const char *path, const char *hoststr,
         sleep(1);
         return 0;
     }
-    
+
     /* wait for header */
     q = line;
     for(;;) {
@@ -286,8 +286,8 @@ URLProtocol http_protocol = {
 /*****************************************************************************
  * b64_encode: stolen from VLC's http.c
  *****************************************************************************/
-                                                                                
-static char *b64_encode( unsigned char *src )
+
+static char *b64_encode( const unsigned char *src )
 {
     static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
     unsigned int len= strlen(src);
@@ -317,16 +317,16 @@ static char *b64_encode( unsigned char *src )
             *dst++ = '=';
             break;
         }
-                                                                                
+
         while( i_shift >= 6 )
         {
             i_shift -= 6;
             *dst++ = b64[(i_bits >> i_shift)&0x3f];
         }
     }
-                                                                                
+
     *dst++ = '\0';
-                                                                                
+
     return ret;
 }