diff options
| -rw-r--r-- | etc/codecs.conf | 16 | ||||
| -rw-r--r-- | libao2/ao_mpegpes.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_theora.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vf_eq2.c | 2 |
4 files changed, 18 insertions, 4 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 4a05f15190..c3f2c6987b 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -4135,6 +4135,7 @@ audiocodec msgsm format 0x31 format 0x32 format 0x204D5347 + format 0x1500 fourcc agsm driver msgsm @@ -4454,6 +4455,7 @@ audiocodec fftruespeech info "FFmpeg TrueSpeech" status working format 0x22 + format 0x1501 driver ffmpeg dll "truespeech" @@ -4464,6 +4466,20 @@ audiocodec truespeech driver acm dll "tssoft32.acm" ; need also tsd32.dll +audiocodec netspeakgsm + info "NetSpeak GSM" + status working + format 0x1500 + driver acm + dll "nsgsm32.acm" + +audiocodec netspeakts + info "NetSpeak TrueSpeech" + status working + format 0x1501 + driver acm + dll "nstsp32.acm" + ; rt32dcmp.dll needed too audiocodec voxwarert24 info "VoxWare RT24 speech codec" diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index f6ab1c6aca..e359d06536 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -330,8 +330,6 @@ static int play(void* data,int len,int flags){ if(ao_data.format==AF_FORMAT_MPEG2) send_mpeg_pes_packet (data, len, 0x1C0, ao_data.pts, 1, my_ao_write); else { - int i; - unsigned short *s=data; // if(len>2000) len=2000; // printf("ao_mpegpes: len=%d \n",len); send_mpeg_lpcm_packet(data, len, 0xA0, ao_data.pts, freq_id, my_ao_write); diff --git a/libmpcodecs/vd_theora.c b/libmpcodecs/vd_theora.c index df4968cd1f..3bf7ab83b9 100644 --- a/libmpcodecs/vd_theora.c +++ b/libmpcodecs/vd_theora.c @@ -45,7 +45,7 @@ LIBVD_EXTERN(theora) static int control(sh_video_t *sh,int cmd,void* arg,...){ switch(cmd) { case VDCTRL_QUERY_FORMAT: - if ((*((int*)arg)) == IMGFMT_YV12) + if (*(int*)arg == IMGFMT_YV12) return CONTROL_TRUE; return CONTROL_FALSE; } diff --git a/libmpcodecs/vf_eq2.c b/libmpcodecs/vf_eq2.c index 32048ec6d2..45d3f61b0b 100644 --- a/libmpcodecs/vf_eq2.c +++ b/libmpcodecs/vf_eq2.c @@ -5,7 +5,7 @@ * Daniel Moreno <comac@comac.darktech.org> (saturation, R/G/B gamma support) * Richard Felker (original MMX contrast/brightness code (vf_eq.c)) * Michael Niedermayer <michalni@gmx.at> (LUT16) -/* + * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify |