Merge branch 'master' of git://git.videolan.org/vlc

diff --git a/extras/package/macosx/Resources/shuffle_embedded.png b/extras/package/macosx/Resources/shuffle_embedded.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/extras/package/macosx/Resources/shuffle_embedded_blue.png b/extras/package/macosx/Resources/shuffle_embedded_blue.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 8541768ff5f03c7b71e9d68eca7e4e950aec86b0..5b8c265f51c2403afc9f1d1f5869f2f8ed4e718d 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -226,6 +226,14 @@ VLC_PUBLIC_API const char * libvlc_get_compiler(void);
  */
 VLC_PUBLIC_API const char * libvlc_get_changeset(void);
 
+/**
+ * Frees an heap allocation returned by a LibVLC function.
+ * If you know you're using the same underlying C run-time as the LibVLC
+ * implementation, then you can call ANSI C free() directly instead.
+ *
+ * \param ptr the pointer
+ */
+VLC_PUBLIC_API void libvlc_free( void *ptr );
 
 /** \defgroup libvlc_event LibVLC asynchronous events
  * LibVLC emits asynchronous events.

diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index e8fe7a7a970954fbf2de9ec1cf6ef6e9d6d2f57c..105090eafc13e384e06fbeee2935c4c595a5958a 100644 (file)
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -735,7 +735,7 @@ VLC_PUBLIC_API void libvlc_video_set_scale( libvlc_media_player_t *p_mi, float f
  *
  * \param p_mi the media player
  * \return the video aspect ratio or NULL if unspecified
- * (the result must be released with free()).
+ * (the result must be released with free() or libvlc_free()).
  */
 VLC_PUBLIC_API char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi );
 

diff --git a/modules/access/rtp/rtp.c b/modules/access/rtp/rtp.c
old mode 100644 (file)
new mode 100755 (executable)
index 32e13b3..c896270
--- a/modules/access/rtp/rtp.c
+++ b/modules/access/rtp/rtp.c
@@ -431,7 +431,6 @@ static void codec_decode (demux_t *demux, void *data, block_t *block)
         block_Release (block);
 }
 
-
 static void *stream_init (demux_t *demux, const char *name)
 {
     return stream_DemuxNew (demux, name, demux->out);
@@ -454,6 +453,11 @@ static void stream_decode (demux_t *demux, void *data, block_t *block)
     (void)demux;
 }
 
+static void *demux_init (demux_t *demux)
+{
+    return stream_init (demux, demux->psz_demux);
+}
+
 /*
  * Static payload types handler
  */
@@ -679,7 +683,22 @@ int rtp_autodetect (demux_t *demux, rtp_session_t *session,
         break;
 
       default:
-        return -1;
+        /*
+         * If the rtp payload type is unknown then check demux if it is specified
+         */
+        if ((strcmp(demux->psz_demux, "h264") == 0) || (strcmp(demux->psz_demux, "ts") == 0))
+        {
+          msg_Dbg (demux, "rtp autodetect specified demux=%s", demux->psz_demux);
+          pt.init = demux_init;
+          pt.destroy = stream_destroy;
+          pt.decode = stream_decode;
+          pt.frequency = 90000;
+          break;
+        }
+        else
+        {
+          return -1;
+        }
     }
     rtp_add_type (demux, session, &pt);
     return 0;

diff --git a/src/control/core.c b/src/control/core.c
index 1411e9c0824bcb8c43b32cf679467719a5974004..745c85af64a27b39ec8986d25912684ba8a73cff 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -159,3 +159,8 @@ const char * libvlc_get_changeset(void)
     extern const char psz_vlc_changeset[];
     return psz_vlc_changeset;
 }
+
+void libvlc_free( void *ptr )
+{
+    free( ptr );
+}

diff --git a/src/libvlc.sym b/src/libvlc.sym
index f635a689fb32933fb634f0152c25e4dc107b03b5..363faff8dc8f3b89386db82bd3733e89592b6a6d 100644 (file)
--- a/src/libvlc.sym
+++ b/src/libvlc.sym
@@ -32,6 +32,7 @@ libvlc_event_manager_register_event_type
 libvlc_event_manager_release
 libvlc_event_send
 libvlc_event_type_name
+libvlc_free
 libvlc_get_changeset
 libvlc_get_compiler
 libvlc_get_fullscreen

diff --git a/test/samples/image.jpg b/test/samples/image.jpg
old mode 100755 (executable)
new mode 100644 (file)