Merge branch 'develop' into feature/gl2283-playlist-location
This commit is contained in:
commit
245611b8e1
|
@ -35,7 +35,7 @@
|
||||||
<decoders>
|
<decoders>
|
||||||
<decoder>
|
<decoder>
|
||||||
<name>OggDec</name>
|
<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>.ogg</file_ext>
|
||||||
<file_ext>.oga</file_ext>
|
<file_ext>.oga</file_ext>
|
||||||
</decoder>
|
</decoder>
|
||||||
|
@ -57,6 +57,12 @@
|
||||||
<program>faad -d -f 2 -w @T@</program>
|
<program>faad -d -f 2 -w @T@</program>
|
||||||
<file_ext>.m4a</file_ext>
|
<file_ext>.m4a</file_ext>
|
||||||
</decoder>
|
</decoder>
|
||||||
|
|
||||||
|
<decoder>
|
||||||
|
<name>Opus</name>
|
||||||
|
<program>opusdec --rate 44100 @T@ -</program>
|
||||||
|
<file_ext>.opus</file_ext>
|
||||||
|
</decoder>
|
||||||
</decoders>
|
</decoders>
|
||||||
|
|
||||||
<encoders>
|
<encoders>
|
||||||
|
|
|
@ -182,7 +182,7 @@
|
||||||
<!-- Decoder name -->
|
<!-- Decoder name -->
|
||||||
<name>OggDec</name>
|
<name>OggDec</name>
|
||||||
<!-- Program and options -->
|
<!-- 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 extensions to use this decoder for -->
|
||||||
<file_ext>.ogg</file_ext>
|
<file_ext>.ogg</file_ext>
|
||||||
<file_ext>.oga</file_ext>
|
<file_ext>.oga</file_ext>
|
||||||
|
|
Loading…
Reference in New Issue