[MPlayer-cvslog] CVS: main codec-cfg.c, 1.119, 1.120 codec-cfg.h, 1.72, 1.73

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv23706

Modified Files:
	codec-cfg.c codec-cfg.h 
Log Message:
Allow forcing of demuxers and codecs by prepending '+'


Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- codec-cfg.c	1 May 2005 13:58:30 -0000	1.119
+++ codec-cfg.c	30 Aug 2005 23:56:21 -0000	1.120
@@ -757,19 +757,19 @@
 }
 
 codecs_t *find_audio_codec(unsigned int fourcc, unsigned int *fourccmap,
-		codecs_t *start)
+		codecs_t *start, int force)
 {
-	return find_codec(fourcc, fourccmap, start, 1);
+	return find_codec(fourcc, fourccmap, start, 1, force);
 }
 
 codecs_t *find_video_codec(unsigned int fourcc, unsigned int *fourccmap,
-		codecs_t *start)
+		codecs_t *start, int force)
 {
-	return find_codec(fourcc, fourccmap, start, 0);
+	return find_codec(fourcc, fourccmap, start, 0, force);
 }
 
 codecs_t* find_codec(unsigned int fourcc,unsigned int *fourccmap,
-		codecs_t *start, int audioflag)
+		codecs_t *start, int audioflag, int force)
 {
 	int i, j;
 	codecs_t *c;
@@ -806,6 +806,7 @@
 					return c;
 				}
 			}
+			if (force) return c;
 		}
 	}
 	return NULL;

Index: codec-cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- codec-cfg.h	28 Jul 2005 12:55:01 -0000	1.72
+++ codec-cfg.h	30 Aug 2005 23:56:21 -0000	1.73
@@ -59,9 +59,12 @@
 } codecs_t;
 
 int parse_codec_cfg(char *cfgfile);
-codecs_t* find_video_codec(unsigned int fourcc, unsigned int *fourccmap, codecs_t *start);
-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);
+codecs_t* find_video_codec(unsigned int fourcc, unsigned int *fourccmap,
+                           codecs_t *start, int force);
+codecs_t* find_audio_codec(unsigned int fourcc, unsigned int *fourccmap,
+                           codecs_t *start, int force);
+codecs_t* find_codec(unsigned int fourcc, unsigned int *fourccmap,
+                     codecs_t *start, int audioflag, int force);
 void select_codec(char* codecname,int audioflag);
 void list_codecs(int audioflag);
 void codecs_reset_selection(int audioflag);