From 0353446472d7641c79b28c22cb1136ee98235cbb Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 4 Dec 2009 17:06:04 +0000 Subject: Bump the FLAC decoder's priority above ffmpegaudio, and build it by default. --- src/combined/decoder_flac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/combined') diff --git a/src/combined/decoder_flac.c b/src/combined/decoder_flac.c index e9a7fbb25..b774e0b90 100644 --- a/src/combined/decoder_flac.c +++ b/src/combined/decoder_flac.c @@ -426,7 +426,7 @@ static 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 = { -- cgit v1.2.3 From 605f33efdd3852f0f09bcaac3e2b25cea6e6c808 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 5 Dec 2009 01:50:52 +0000 Subject: Build fix (undefined symbol) for when using older ffmpeg. --- src/combined/ffmpeg/ff_video_decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/combined') diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 093ca4776..727508847 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -1180,6 +1180,7 @@ static void ff_check_pts_tagging(ff_video_decoder_t *this, uint64_t pts) } } } +#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ static int ff_vc1_find_header(ff_video_decoder_t *this, buf_element_t *buf) { @@ -1224,7 +1225,6 @@ static int ff_check_extradata(ff_video_decoder_t *this, unsigned int codec_type, return 1; } -#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { uint8_t *chunk_buf = this->buf; AVRational avr00 = {0, 1}; -- cgit v1.2.3