intf_Destroy(): use vlc_object_release() and a destructor instead

[vlc] / modules / access / http.c

diff --git a/modules/access/http.c b/modules/access/http.c
index d8715c5930b57092c2817f234f173b700f4f4284..9b28a2360fc921231bb2b060f0753f722f0e57e2 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -50,6 +50,8 @@
 #   include <zlib.h>
 #endif
 
+#include <assert.h>
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -86,9 +88,9 @@ static void Close( vlc_object_t * );
 #define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies Across http redirections ")
 
 vlc_module_begin();
-    set_description( _("HTTP input") );
+    set_description( N_("HTTP input") );
     set_capability( "access", 0 );
-    set_shortname( _( "HTTP(S)" ) );
+    set_shortname( N_( "HTTP(S)" ) );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 
@@ -454,12 +456,21 @@ connect:
         {
             if( !strcasecmp( p_sys->psz_mime, "video/nsv" ) ||
                 !strcasecmp( p_sys->psz_mime, "video/nsa" ) )
+            {
+                free( p_access->psz_demux );
                 p_access->psz_demux = strdup( "nsv" );
+            }
             else if( !strcasecmp( p_sys->psz_mime, "audio/aac" ) ||
                      !strcasecmp( p_sys->psz_mime, "audio/aacp" ) )
+            {
+                free( p_access->psz_demux );
                 p_access->psz_demux = strdup( "m4a" );
+            }
             else if( !strcasecmp( p_sys->psz_mime, "audio/mpeg" ) )
+            {
+                free( p_access->psz_demux );
                 p_access->psz_demux = strdup( "mp3" );
+            }
 
             msg_Info( p_access, "Raw-audio server found, %s demuxer selected",
                       p_access->psz_demux );
@@ -472,8 +483,9 @@ connect:
         }
         else if( !p_sys->psz_mime )
         {
-             /* Shoutcast */
-             p_access->psz_demux = strdup( "mp3" );
+            free( p_access->psz_demux );
+            /* Shoutcast */
+            p_access->psz_demux = strdup( "mp3" );
         }
         /* else probably Ogg Vorbis */
     }
@@ -481,17 +493,22 @@ connect:
              p_sys->psz_mime &&
              !strcasecmp( p_sys->psz_mime, "misc/ultravox" ) )
     {
+        free( p_access->psz_demux );
         /* Grrrr! detect ultravox server and force NSV demuxer */
         p_access->psz_demux = strdup( "nsv" );
     }
     else if( !strcmp( p_access->psz_access, "itpc" ) )
     {
+        free( p_access->psz_demux );
         p_access->psz_demux = strdup( "podcast" );
     }
     else if( p_sys->psz_mime &&
              !strncasecmp( p_sys->psz_mime, "application/xspf+xml", 20 ) &&
              ( memchr( " ;\t", p_sys->psz_mime[20], 4 ) != NULL ) )
+    {
+        free( p_access->psz_demux );
         p_access->psz_demux = strdup( "xspf-open" );
+    }
 
     if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" );