Mercurial > mplayer.hg

changeset 1577:440782e33c81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
aalib 1.4.X incombatibility fixed
author folke
date Fri, 17 Aug 2001 20:34:58 +0000
parents 2dff06ebfbb4
children f4a389d07c5b
files libvo/vo_aa.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_aa.c	Fri Aug 17 14:53:11 2001 +0000
+++ b/libvo/vo_aa.c	Fri Aug 17 20:34:58 2001 +0000
@@ -218,6 +218,7 @@
     struct stat sbuf;
     char * hidis = NULL;
     int i;
+    extern aa_linkedlist *aa_displayrecommended;
 
     switch(format) {
 	case IMGFMT_BGR24:
@@ -240,10 +241,7 @@
 
     /* initializing of aalib */
     
-    /* why removes get after getting it the gotten value out of the list? :( */
-    //hidis=aa_getfirst(&aa_displayrecommended); 
-    if (aa_displayrecommended!=NULL)
-      hidis=aa_displayrecommended->text;
+    hidis=aa_getfirst(&aa_displayrecommended); 
     if ( hidis==NULL ){
 	/* check /dev/vcsa<vt> */
 	/* check only, if no driver is explicit set */
@@ -261,7 +259,7 @@
     	    aa_recommendhidisplay("curses");
     	    aa_recommendhidisplay("X11");
 	}else fclose(fp);
-    }
+    } else aa_recommendhidisplay(hidis);
     c = aa_autoinit(&aa_defparams);
     aa_resizehandler(c, (void *)resize);