Mercurial > mplayer.hg

changeset 5326:0b024f661dd0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use codec selection
author arpi
date Mon, 25 Mar 2002 03:07:27 +0000
parents 9c326f199060
children 674793ca4225
files codec-cfg.c codec-cfg.h mplayer.c
diffstat 3 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/codec-cfg.c	Mon Mar 25 03:02:57 2002 +0000
+++ b/codec-cfg.c	Mon Mar 25 03:07:27 2002 +0000
@@ -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)
--- a/codec-cfg.h	Mon Mar 25 03:02:57 2002 +0000
+++ b/codec-cfg.h	Mon Mar 25 03:07:27 2002 +0000
@@ -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
--- a/mplayer.c	Mon Mar 25 03:02:57 2002 +0000
+++ b/mplayer.c	Mon Mar 25 03:07:27 2002 +0000
@@ -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);