RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-25 09:44:21 +00:00
Code Issues Releases Wiki Activity

Merge svn changes up to r30557

Browse Source
This commit is contained in:
Uoti Urpala 2010-03-09 23:09:46 +02:00
commit 8365d174b6
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etc/codecs.conf
View File

@ -4135,6 +4135,7 @@ audiocodec msgsm
format 0x31 format 0x31
format 0x32 format 0x32
format 0x204D5347 format 0x204D5347
format 0x1500
fourcc agsm fourcc agsm
driver msgsm driver msgsm
@ -4454,6 +4455,7 @@ audiocodec fftruespeech
info "FFmpeg TrueSpeech" info "FFmpeg TrueSpeech"
status working status working
format 0x22 format 0x22
format 0x1501
driver ffmpeg driver ffmpeg
dll "truespeech" dll "truespeech"
@ -4464,6 +4466,20 @@ audiocodec truespeech
driver acm driver acm
dll "tssoft32.acm" ; need also tsd32.dll 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 ; rt32dcmp.dll needed too
audiocodec voxwarert24 audiocodec voxwarert24
info "VoxWare RT24 speech codec" info "VoxWare RT24 speech codec"

2
libao2/ao_mpegpes.c
View File

@ -330,8 +330,6 @@ static int play(void* data,int len,int flags){
if(ao_data.format==AF_FORMAT_MPEG2) if(ao_data.format==AF_FORMAT_MPEG2)
send_mpeg_pes_packet (data, len, 0x1C0, ao_data.pts, 1, my_ao_write); send_mpeg_pes_packet (data, len, 0x1C0, ao_data.pts, 1, my_ao_write);
else { else {
int i;
unsigned short *s=data;
// if(len>2000) len=2000; // if(len>2000) len=2000;
// printf("ao_mpegpes: len=%d \n",len); // printf("ao_mpegpes: len=%d \n",len);
send_mpeg_lpcm_packet(data, len, 0xA0, ao_data.pts, freq_id, my_ao_write); send_mpeg_lpcm_packet(data, len, 0xA0, ao_data.pts, freq_id, my_ao_write);

2
libmpcodecs/vd_theora.c
View File

@ -45,7 +45,7 @@ LIBVD_EXTERN(theora)
static int control(sh_video_t *sh,int cmd,void* arg,...){ static int control(sh_video_t *sh,int cmd,void* arg,...){
switch(cmd) { switch(cmd) {
case VDCTRL_QUERY_FORMAT: case VDCTRL_QUERY_FORMAT:
if ((*((int*)arg)) == IMGFMT_YV12) if (*(int*)arg == IMGFMT_YV12)
return CONTROL_TRUE; return CONTROL_TRUE;
return CONTROL_FALSE; return CONTROL_FALSE;
} }

2
libmpcodecs/vf_eq2.c
View File

@ -5,7 +5,7 @@
* Daniel Moreno <comac@comac.darktech.org> (saturation, R/G/B gamma support) * Daniel Moreno <comac@comac.darktech.org> (saturation, R/G/B gamma support)
* Richard Felker (original MMX contrast/brightness code (vf_eq.c)) * Richard Felker (original MMX contrast/brightness code (vf_eq.c))
* Michael Niedermayer <michalni@gmx.at> (LUT16) * Michael Niedermayer <michalni@gmx.at> (LUT16)
/* *
* This file is part of MPlayer. * This file is part of MPlayer.
* *
* MPlayer is free software; you can redistribute it and/or modify * MPlayer is free software; you can redistribute it and/or modify