Merge svn changes up to r31100

3 files changed, 3 insertions, 3 deletions

diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index e866016740..a91c422740 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -615,7 +615,7 @@ mencoder mf://<replaceable>@list.txt</replaceable> -mf w=800:h=600:fps=25:type=j
 </informalexample>
 
 You can mix different types of images, regardless of the method you use
-t &mdash; individual filenames, wildcard or file with list &mdash; provided of
+&mdash; individual filenames, wildcard or file with list &mdash; provided of
 course they have the same dimensions.
 So you can e.g. take title frame from PNG file,
 and then put a slideshow of your JPEG photos.
diff --git a/configure b/configure
index 73d8bae630..ac1ef0d4da 100755
--- a/configure
+++ b/configure
@@ -7728,7 +7728,7 @@ if test "$_largefiles" = yes || freebsd ; then
   fi
 fi
 
-CXXFLAGS=" $CFLAGS -Iffmpeg -D__STDC_LIMIT_MACROS"
+CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS"
 
 # This must be the last test to be performed. Any other tests following it
 # could fail due to linker errors. libdvdnavmini is intentionally not linked
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index c6ffe8f860..02e42ff221 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -336,9 +336,9 @@ static void init_atoms(struct vo_x11_state *x11)
 
 void update_xinerama_info(struct vo *vo) {
     struct MPOpts *opts = vo->opts;
-    int screen = xinerama_screen;
     xinerama_x = xinerama_y = 0;
 #ifdef CONFIG_XINERAMA
+    int screen = xinerama_screen;
     if (screen >= -1 && XineramaIsActive(vo->x11->display))
     {
         XineramaScreenInfo *screens;