Merge branch 1.0-bugfix

diff --cc modules/gui/macosx/controls.h
Simple merge

diff --cc modules/gui/macosx/controls.m
index aa06beb8e34c36d4a8c0266ea79ec38b5886921e,8b864e6f2bbc62fe03ea5ab437c0fdbc565a4c7b..ef16ff5d6a7b0ad9bd98d528752ebe56286892ee
--- 1/modules/gui/macosx/controls.m
--- 2/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@@ -136,26 -161,31 +137,31 @@@
  
  - (id)voutView
  {
 -    id window;
 -    id voutView = nil;
 -    id embeddedViewList = [[VLCMain sharedInstance] embeddedList];
 -    NSEnumerator *enumerator = [[NSApp orderedWindows] objectEnumerator];
 -    while( !voutView && ( window = [enumerator nextObject] ) )
 +    id o_window;
 +    id o_voutView = nil;
 +    id o_embeddedViewList = [[VLCMain sharedInstance] embeddedList];
 +    NSEnumerator *o_enumerator = [[NSApp orderedWindows] objectEnumerator];
 +    while( !o_voutView && ( o_window = [o_enumerator nextObject] ) )
      {
          /* We have an embedded vout */
 -        if( [embeddedViewList windowContainsEmbedded: window] )
 +        if( [o_embeddedViewList windowContainsEmbedded: o_window] )
          {
 -            voutView = [embeddedViewList viewForWindow: window];
 +            o_voutView = [o_embeddedViewList viewForWindow: o_window];
          }
          /* We have a detached vout */
 -        else if( [[window className] isEqualToString: @"VLCVoutWindow"] )
 +        else if( [[o_window className] isEqualToString: @"VLCVoutWindow"] )
          {
 -            voutView = [window voutView];
 +            o_voutView = [o_window voutView];
          }
      }
 -    return [[voutView retain] autorelease];
 +    return [[o_voutView retain] autorelease];
  }
  
+ - (BOOL)aspectRatioIsLocked
+ {
+     return b_lockAspectRatio;
+ }
+ 
  - (IBAction)stop:(id)sender
  {
      intf_thread_t * p_intf = VLCIntf;

diff --cc modules/video_filter/alphamask.c
Simple merge

diff --cc src/control/media_player.c
Simple merge