* input: added a meta field to input.

 * network: export ipv4 name resolution.

diff --git a/include/network.h b/include/network.h
index 0d475ea47f478c6723b09403ba0c4c65368f1f82..153e9657c1e3151d0da5b9f63de0b34fe00ee90a 100644 (file)
--- a/include/network.h
+++ b/include/network.h
@@ -211,6 +211,7 @@ static inline char *vlc_b64_encode( unsigned char *src )
     return ret;
 }
 
+VLC_EXPORT( int, net_ConvertIPv4, ( uint32_t *p_addr, const char * psz_address ) );
 
 /* Portable networking layer communication */
 #define net_OpenTCP(a, b, c) __net_OpenTCP(VLC_OBJECT(a), b, c)

diff --git a/include/vlc/input.h b/include/vlc/input.h
index 89c32622000d43a8b8cb27d729c3a2ceff2b0f8f..747e6e058772fd8803804569ce60f05f7048a1a8 100644 (file)
--- a/include/vlc/input.h
+++ b/include/vlc/input.h
@@ -35,6 +35,7 @@ extern "C" {
  * Required internal headers
  *****************************************************************************/
 #include "vlc_block.h"
+#include "vlc_meta.h"
 
 #include "vlc_es.h"
 #include "vlc_es_out.h"

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 3cded711707a0da2eeced2e9338c4ebe55ab4079..1d50601aba20d98d8f458ec333e8f82636b71931 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -346,6 +346,9 @@ struct input_thread_t
     int         i_bookmark;
     seekpoint_t **bookmark;
 
+    /* Global meta datas FIXME move to input_item_t ? */
+    vlc_meta_t  *p_meta;
+
     /* Output */
     es_out_t    *p_es_out;
     sout_instance_t *p_sout;            /* XXX Move it to es_out ? */