From 833a4e427db532f244055acad54620057a824b18 Mon Sep 17 00:00:00 2001 From: compn Date: Sat, 13 Feb 2010 17:39:34 +0000 Subject: add netspeak versions of truespeech and gsm audio codecs to codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30554 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/etc/codecs.conf b/etc/codecs.conf index ad1bbcca9a..bbdc753be4 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -4136,6 +4136,7 @@ audiocodec msgsm format 0x31 format 0x32 format 0x204D5347 + format 0x1500 fourcc agsm driver msgsm @@ -4455,6 +4456,7 @@ audiocodec fftruespeech info "FFmpeg TrueSpeech" status working format 0x22 + format 0x1501 driver ffmpeg dll "truespeech" @@ -4465,6 +4467,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" -- cgit v1.2.3 From 1b3d1fcd9db1e3c86e7ac9f8f22233aaf849fa26 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 13 Feb 2010 21:29:32 +0000 Subject: Remove unused variables, fixes the warnings: libao2/ao_mpegpes.c:336: warning: unused variable 's' libao2/ao_mpegpes.c:335: warning: unused variable 'i' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30555 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_mpegpes.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index c047fb304f..f87fa19fcd 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -332,8 +332,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); -- cgit v1.2.3 From e8d058b8efde3727bf3af2defad87ee61ad03fb8 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 13 Feb 2010 21:32:19 +0000 Subject: Remove stray '/' from comment block, fixes the warning: libmpcodecs/vf_eq2.c:8:1: warning: "/*" within comment git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30556 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_eq2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 (saturation, R/G/B gamma support) * Richard Felker (original MMX contrast/brightness code (vf_eq.c)) * Michael Niedermayer (LUT16) -/* + * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify -- cgit v1.2.3 From 3e5d40ff2e9a45cb4f55f23b787f32bf359bd3d5 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 14 Feb 2010 09:19:30 +0000 Subject: Remove excessive () git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30557 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_theora.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v1.2.3