[MPlayer-cvslog] CVS: main/libmpdemux demux_lavf.c,1.18,1.19

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

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

Modified Files:
	demux_lavf.c 
Log Message:
Fix the broken last commit.


Index: demux_lavf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_lavf.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- demux_lavf.c	28 Jul 2005 13:43:23 -0000	1.18
+++ demux_lavf.c	28 Jul 2005 13:58:12 -0000	1.19
@@ -217,15 +217,24 @@
             sh_audio->channels= codec->channels;
             sh_audio->samplerate= codec->sample_rate;
             sh_audio->i_bps= codec->bit_rate/8;
+printf("id: %x %i\n", codec->codec_tag, codec->codec_id);
             switch (codec->codec_id) {
               case CODEC_ID_PCM_S8:
               case CODEC_ID_PCM_U8:
                 sh_audio->samplesize = 1;
+                break;
               case CODEC_ID_PCM_S16LE:
               case CODEC_ID_PCM_S16BE:
               case CODEC_ID_PCM_U16LE:
               case CODEC_ID_PCM_U16BE:
                 sh_audio->samplesize = 2;
+                break;
+              case CODEC_ID_PCM_ALAW:
+                sh_audio->format = 0x6;
+                break;
+              case CODEC_ID_PCM_MULAW:
+                sh_audio->format = 0x7;
+                break;
             }
             if(verbose>=1) print_wave_header(sh_audio->wf);
             if(demuxer->audio->id != i && demuxer->audio->id != -1)