[MPlayer-cvslog] CVS: main/libmpcodecs ae_lavc.c,1.3,1.4

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

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

Modified Files:
	ae_lavc.c 
Log Message:
restore old lavc_find_atag to be used when compiling mplayer without libavformat

Index: ae_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ae_lavc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ae_lavc.c	22 Apr 2005 17:53:31 -0000	1.3
+++ ae_lavc.c	22 Apr 2005 23:57:43 -0000	1.4
@@ -116,6 +116,30 @@
 	return compressed_frame_size;
 }
 
+static uint32_t lavc_find_atag(char *codec)
+{
+	if(codec == NULL)
+	        return 0;
+
+	if(! strcasecmp(codec, "mp2"))
+		return 0x50;
+
+	if(! strcasecmp(codec, "mp3"))
+		return 0x55;
+
+	if(! strcasecmp(codec, "ac3"))
+		return 0x2000;
+
+	if(! strcasecmp(codec, "adpcm_ima_wav"))
+		return 0x11;
+
+	if(! strncasecmp(codec, "bonk", 4))
+		return 0x2048;
+
+	return 0;
+}
+
+
 int mpae_init_lavc(audio_encoder_t *encoder)
 {
 	encoder->params.samples_per_frame = encoder->params.sample_rate;
@@ -141,7 +165,11 @@
 	}
 	if(lavc_param_atag == 0)
 	{
+#ifdef USE_LIBAVFORMAT
 		lavc_param_atag = codec_get_wav_tag(lavc_acodec->id);
+#else
+		lavc_param_atag = lavc_find_atag(lavc_param_acodec);
+#endif
 		if(!lavc_param_atag)
 		{
 			mp_msg(MSGT_MENCODER, MSGL_FATAL, "Couldn't find wav tag for specified codec, exit\n");