From 1fc371c73a9eb02413f3821f56c3175095236592 Mon Sep 17 00:00:00 2001
From: alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 4 Oct 2004 19:36:12 +0000
Subject: move the file writers after vo_null so they don't get autoselected -
 following the same logic as in libao2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13552 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/video_out.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'libvo')

diff --git a/libvo/video_out.c b/libvo/video_out.c
index 44dcbd07cb..a7b7a589e2 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -203,20 +203,6 @@ vo_functions_t* video_out_drivers[] =
 #ifdef HAVE_BL
 	&video_out_bl,
 #endif
-
-#ifdef HAVE_PNG
-	&video_out_png,
-#endif	
-#ifdef HAVE_JPEG
-	&video_out_jpeg,
-#endif
-#ifdef HAVE_GIF
-	&video_out_gif89a,
-#endif
-        &video_out_null,
-//        &video_out_odivx,
-	&video_out_mpegpes,
-	&video_out_yuv4mpeg,
 #ifdef HAVE_VESA
 	&video_out_vesa,
 #endif
@@ -234,6 +220,19 @@ vo_functions_t* video_out_drivers[] =
     &video_out_winvidix,
 #endif
     &video_out_cvidix,
+#endif
+        &video_out_null,
+	// should not be auto-selected
+	&video_out_mpegpes,
+	&video_out_yuv4mpeg,
+#ifdef HAVE_PNG
+	&video_out_png,
+#endif	
+#ifdef HAVE_JPEG
+	&video_out_jpeg,
+#endif
+#ifdef HAVE_GIF
+	&video_out_gif89a,
 #endif
 #ifdef HAVE_TGA
         &video_out_tga,
-- 
cgit v1.2.3