comparison etc/codecs.conf @ 34950:7d84339b35b5

fix previous commit, duplicated g7231 codec entry
author compn
date Sat, 21 Jul 2012 11:08:14 +0000
parents f43323b9b020
children 75c3f928afdd
comparison
equal deleted inserted replaced
34949:f43323b9b020 34950:7d84339b35b5
5518 format 0x111 ; vivo g.723 5518 format 0x111 ; vivo g.723
5519 format 0x112 ; siren 5519 format 0x112 ; siren
5520 driver acm 5520 driver acm
5521 dll "vivog723.acm" 5521 dll "vivog723.acm"
5522 5522
5523 audiocodec ffg7231
5524 info "G.723.1 MS"
5525 status working
5526 format 0x42
5527 driver ffmpeg
5528 dll "g723_1"
5529
5530 audiocodec g7231ms
5531 info "G.723.1 MS"
5532 status working
5533 format 0x42
5534 driver acm
5535 dll "msg723.acm"
5536
5537 audiocodec g72x 5523 audiocodec g72x
5538 info "G.711/G.721/G.723" 5524 info "G.711/G.721/G.723"
5539 status crashing 5525 status crashing
5540 comment "does not work yet - just noise :(" 5526 comment "does not work yet - just noise :("
5541 format 0x111 ; vivo g.723 5527 format 0x111 ; vivo g.723
5552 5538
5553 audiocodec ffg7231 5539 audiocodec ffg7231
5554 info "G.723.1 Audio" 5540 info "G.723.1 Audio"
5555 status working 5541 status working
5556 fourcc 7231 ; internal MPlayer FourCC 5542 fourcc 7231 ; internal MPlayer FourCC
5543 format 0x42
5557 driver ffmpeg 5544 driver ffmpeg
5558 dll "g723_1" 5545 dll "g723_1"
5546
5547 audiocodec g7231ms
5548 info "G.723.1 MS"
5549 status working
5550 format 0x42
5551 driver acm
5552 dll "msg723.acm"
5559 5553
5560 audiocodec ffg726 5554 audiocodec ffg726
5561 info "Sharp G.726 Audio" 5555 info "Sharp G.726 Audio"
5562 status working 5556 status working
5563 format 0x45 5557 format 0x45