summaryrefslogtreecommitdiff
path: root/src/combined
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-12-12 03:05:33 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-12-12 03:05:33 +0000
commit8bd8e600bf475426cbcd5b8f8f89fb2d6e53ec29 (patch)
tree96f97a7a8bc898ff7036c3a0c8ec366530c059b2 /src/combined
parent258ff7f5eef3a0813f04c4c78f28f50fb601bef7 (diff)
parentd6e3f2809541eb3b0753222a582d30bc13c31b55 (diff)
downloadxine-lib-8bd8e600bf475426cbcd5b8f8f89fb2d6e53ec29.tar.gz
xine-lib-8bd8e600bf475426cbcd5b8f8f89fb2d6e53ec29.tar.bz2
Merge from 1.1.
--HG-- rename : include/xine.h.in => include/xine.h rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c rename : src/libspuhdmv/xine_hdmv_decoder.c => src/spu_dec/spuhdmv_decoder.c
Diffstat (limited to 'src/combined')
-rw-r--r--src/combined/flac_decoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c
index 94c0d30f2..312749c7b 100644
--- a/src/combined/flac_decoder.c
+++ b/src/combined/flac_decoder.c
@@ -404,7 +404,7 @@ static const uint32_t audio_types[] = {
static const decoder_info_t dec_info_audio = {
audio_types, /* supported types */
- 5 /* priority */
+ 8 /* priority */
};
const plugin_info_t xine_plugin_info[] EXPORTED = {