1
0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2024-12-04 14:46:31 -05:00

Merge branch 'develop' into feature/gl2283-playlist-location

This commit is contained in:
Moritz Grimm 2023-01-19 23:45:06 +01:00
commit 245611b8e1
2 changed files with 8 additions and 2 deletions

View File

@ -35,7 +35,7 @@
<decoders>
<decoder>
<name>OggDec</name>
<program>oggdec -R -b 16 -e 1 -s 1 -o - @T@</program>
<program>oggdec -R -b 16 -o - @T@</program>
<file_ext>.ogg</file_ext>
<file_ext>.oga</file_ext>
</decoder>
@ -57,6 +57,12 @@
<program>faad -d -f 2 -w @T@</program>
<file_ext>.m4a</file_ext>
</decoder>
<decoder>
<name>Opus</name>
<program>opusdec --rate 44100 @T@ -</program>
<file_ext>.opus</file_ext>
</decoder>
</decoders>
<encoders>

View File

@ -182,7 +182,7 @@
<!-- Decoder name -->
<name>OggDec</name>
<!-- Program and options -->
<program>oggdec -R -b 16 -e 1 -s 1 -o - @T@</program>
<program>oggdec -R -b 16 -o - @T@</program>
<!-- File extensions to use this decoder for -->
<file_ext>.ogg</file_ext>
<file_ext>.oga</file_ext>