Merge commit 'origin/1.0-bugfix'

diff --cc NEWS
index 433a682930f145e312f1dd1b8898b376d391cf1e,06ff7e1ae3cffb81dd4ccf2aa650c18a39d2561d..ec2eae6496b07f9d646898e6f5098e242de5f95e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,11 -1,4 +1,11 @@@
- Changes between 0.9.9a and 1.0.0-rc1:
 +Changes between 1.0.0-rc1 and 1.1.0-git:
 +----------------------------------------
 +
 +Mac OS X Interface:
 + * Completely reworked user interface (based upon works from GSoC 2008)
 +
 +
+ Changes between 0.9.9a and 1.0.0-rc2:
  ------------------------------------
  
  Important notes:

diff --cc modules/video_output/snapshot.c
index 5b6c4c330add7296b59898af02ab7ea4430109ed,2fc7c2af8f89885436fb48481c887723fef1b57a..411f1e56150ea038d79d906bc23c71ea39c16b2f
--- 1/modules/video_output/snapshot.c
--- 2/modules/video_output/snapshot.c
+++ b/modules/video_output/snapshot.c
@@@ -157,22 -159,24 +159,28 @@@ static int Init( vout_thread_t *p_vout 
      int i_height;
      int i_datasize;
  
-     i_width  = config_GetInt( p_vout, "snapshot-width" );
-     i_height = config_GetInt( p_vout, "snapshot-height" );
+     i_width  = config_GetInt( p_vout, "vout-snapshot-width" );
+     i_height = config_GetInt( p_vout, "vout-snapshot-height" );
  
-     psz_chroma = config_GetPsz( p_vout, "snapshot-chroma" );
-     if( !psz_chroma )
+     psz_chroma = config_GetPsz( p_vout, "vout-snapshot-chroma" );
+     if( psz_chroma )
      {
-         msg_Err( p_vout, "Cannot find chroma information." );
-         return VLC_EGENERIC;
+         if( strlen( psz_chroma ) < 4 )
+         {
+             msg_Err( p_vout, "vout-snapshot-chroma should be 4 characters long" );
+             return VLC_EGENERIC;
+         }
+         i_chroma = VLC_FOURCC( psz_chroma[0], psz_chroma[1],
+                                psz_chroma[2], psz_chroma[3] );
+         free( psz_chroma );
      }
 -    else
 +
 +    i_chroma = vlc_fourcc_GetCodecFromString( VIDEO_ES, psz_chroma );
 +    free( psz_chroma );
 +
 +    if( !i_chroma )
      {
 -        msg_Err( p_vout, "Cannot find chroma information." );
 +        msg_Err( p_vout, "snapshot-chroma should be 4 characters long" );
          return VLC_EGENERIC;
      }
  

diff --cc src/video_output/video_output.c
Simple merge

diff --cc src/video_output/vout_pictures.c
Simple merge