[Mplayer-cvslog] CVS: main mplayer.c,1.446,1.447 codec-cfg.h,1.51,1.52 codec-cfg.c,1.78,1.79

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv9103

Modified Files:
	mplayer.c codec-cfg.h codec-cfg.c 
Log Message:
use codec selection

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- mplayer.c	23 Mar 2002 22:50:25 -0000	1.446
+++ mplayer.c	25 Mar 2002 03:07:27 -0000	1.447
@@ -1187,6 +1187,7 @@
 
 // Go through the codec.conf and find the best codec...
 sh_video->inited=0;
+codecs_reset_selection(0);
 if(video_codec){
     // forced codec by name:
     mp_msg(MSGT_CPLAYER,MSGL_INFO,"Forced video codec: %s\n",video_codec);

Index: codec-cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- codec-cfg.h	25 Mar 2002 03:02:57 -0000	1.51
+++ codec-cfg.h	25 Mar 2002 03:07:27 -0000	1.52
@@ -104,5 +104,6 @@
 codecs_t* find_audio_codec(unsigned int fourcc, unsigned int *fourccmap, codecs_t *start);
 codecs_t* find_codec(unsigned int fourcc,unsigned int *fourccmap,codecs_t *start,int audioflag);
 void list_codecs(int audioflag);
+void codecs_reset_selection(int audioflag);
 
 #endif

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- codec-cfg.c	25 Mar 2002 03:02:57 -0000	1.78
+++ codec-cfg.c	25 Mar 2002 03:07:27 -0000	1.79
@@ -698,6 +698,7 @@
 		if(!i) return NULL;
 		for (/* NOTHING */; i--; c++) {
                         if(start && c<=start) continue;
+			if(c->flags&CODECS_FLAG_SELECTED) continue;
 			for (j = 0; j < CODECS_MAX_FOURCC; j++) {
 				if (c->fourcc[j]==fourcc || c->driver==0) {
 					if (fourccmap)