[vlc-devel] commit: cosmetics. ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Thu Jul 23 08:18:20 2009 +0200| [7962ffa37cd8e61e2e311e73636c736e5a24e102] | committer: Rémi Duraffort 

cosmetics.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7962ffa37cd8e61e2e311e73636c736e5a24e102
---

 src/control/media.c        |   14 +++-----------
 src/control/media_player.c |    4 ++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/control/media.c b/src/control/media.c
index 4b3ee38..aaf6a37 100644
--- a/src/control/media.c
+++ b/src/control/media.c
@@ -352,11 +352,11 @@ libvlc_media_t * libvlc_media_new_as_node(
  **************************************************************************/
 void libvlc_media_add_option(
                                    libvlc_media_t * p_md,
-                                   const char * ppsz_option,
+                                   const char * psz_option,
                                    libvlc_exception_t *p_e )
 {
     VLC_UNUSED(p_e);
-    input_item_AddOption( p_md->p_input_item, ppsz_option,
+    input_item_AddOption( p_md->p_input_item, psz_option,
                           VLC_INPUT_OPTION_UNIQUE|VLC_INPUT_OPTION_TRUSTED );
 }
 
@@ -598,13 +598,5 @@ libvlc_media_get_user_data( libvlc_media_t * p_md,
                                        libvlc_exception_t * p_e )
 {
     VLC_UNUSED(p_e);
-
-    if( p_md )
-    {
-        return p_md->p_user_data;
-    }
-    else
-    {
-        return NULL;
-    }
+    return p_md ? p_md->p_user_data : NULL;
 }
diff --git a/src/control/media_player.c b/src/control/media_player.c
index 3194078..f0e745d 100644
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -595,13 +595,13 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi,
         var_Set( p_input_thread, "drawable-hwnd", val );
     }
 
-	var_Create( p_input_thread, "drawable-nsobject", VLC_VAR_ADDRESS );
+    var_Create( p_input_thread, "drawable-nsobject", VLC_VAR_ADDRESS );
     if( p_mi->drawable.nsobject != NULL )
     {
         vlc_value_t val = { .p_address = p_mi->drawable.nsobject };
         var_Set( p_input_thread, "drawable-nsobject", val );
     }
-	
+
     var_AddCallback( p_input_thread, "can-seek", input_seekable_changed, p_mi );
     var_AddCallback( p_input_thread, "can-pause", input_pausable_changed, p_mi );
     var_AddCallback( p_input_thread, "intf-event", input_event_changed, p_mi );