Video resize function added in libvlc.

Typo fix in modules/stream_out/bridge.c

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 4cb38b32ca4366538b9208a074a0276f497d70b2..017c9ec13d8bec31410b46d2554324c5f0153b21 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -335,6 +335,17 @@ void libvlc_video_take_snapshot( libvlc_input_t *, char *, libvlc_exception_t *
     
 int libvlc_video_destroy( libvlc_input_t *, libvlc_exception_t *);
 
+    
+/**
+ * Resize the video output window
+ * \param p_instance libvlc instance
+ * \param width new width for video output window
+ * \param height new height for video output window
+ * \param p_exception an initialized exception
+ * \return the mute status (boolean)
+ */
+void libvlc_video_resize( libvlc_input_t *, int, int, libvlc_exception_t *);
+    
 /**
 * Downcast to this general type as placeholder for a platform specific one, such as:
 *  Drawable on X11,
@@ -343,8 +354,16 @@ int libvlc_video_destroy( libvlc_input_t *, libvlc_exception_t *);
 */
 typedef int libvlc_drawable_t;
 
+/**
+ * Get current mute status
+ * \param p_instance libvlc instance
+ * \param drawable the new parent window (Drawable on X11, CGrafPort on MacOSX, HWND on Win32)
+ * \param p_exception an initialized exception
+ * \return the mute status (boolean)
+ */
 int libvlc_video_reparent( libvlc_input_t *, libvlc_drawable_t, libvlc_exception_t * );
 
+
 /** @} */
 
 /**

diff --git a/modules/stream_out/bridge.c b/modules/stream_out/bridge.c
index 810e7398ae7ed2ac586d9a0f84e5e68d6ea7c689..e1174d36f204a2f8db0fb3e82d48c4789d748828 100644 (file)
--- a/modules/stream_out/bridge.c
+++ b/modules/stream_out/bridge.c
@@ -40,7 +40,7 @@
 
 #define DELAY_TEXT N_("Delay")
 #define DELAY_LONGTEXT N_("Pictures coming from the picture video outputs " \
-        "will be delayed accord to thi value (in milliseconds, should be "\
+        "will be delayed according to this value (in milliseconds, should be "\
         ">= 100 ms). For high values, you will need to raise caching values." )
 
 #define ID_OFFSET_TEXT N_("ID Offset")

diff --git a/src/control/video.c b/src/control/video.c
index 87dc4adc29da80c2c5103f6f939f87c47b3b7ec3..1ec56b07375a6184dc9a770a4fe79aa72161919b 100644 (file)
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -2,9 +2,11 @@
  * video.c: libvlc new API video functions
  *****************************************************************************
  * Copyright (C) 2005 the VideoLAN team
+ *
  * $Id: core.c 14187 2006-02-07 16:37:40Z courmisch $
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
+ *          Filippo Carone <littlejohn@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +29,10 @@
 #include <vlc/vout.h>
 #include <vlc/intf.h>
 
+/*
+ * Remember to release the returned vout_thread_t since it is locked at
+ * the end of this function.
+ */
 static vout_thread_t *GetVout( libvlc_input_t *p_input,
                                libvlc_exception_t *p_exception )
 {
@@ -215,10 +221,20 @@ int libvlc_video_reparent( libvlc_input_t *p_input, libvlc_drawable_t d,
 {
     vout_thread_t *p_vout = GetVout( p_input, p_e );
     vout_Control( p_vout , VOUT_REPARENT, d);
+    vlc_object_release( p_vout );
+    
     return 0;
     
 }
 
+void libvlc_video_resize( libvlc_input_t *p_input, int width, int height, libvlc_exception_t *p_e )
+{
+    vout_thread_t *p_vout = GetVout( p_input, p_e );
+    vout_Control( p_vout, VOUT_SET_SIZE, width, height );
+    vlc_object_release( p_vout );
+}
+
+
 int libvlc_video_destroy( libvlc_input_t *p_input,
                           libvlc_exception_t *p_e )
 {