diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-05-06 02:27:38 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-05-06 02:27:38 +0100 |
| commit | 8ff78df42588e88762aaf1581f0e86a270f4a59d (patch) | |
| tree | 7511f7788290a38a78d523d7c824efa31ad5e215 /src/combined | |
| parent | 61445f16252380d4f6b66f2c5680d36e62bbfd0f (diff) | |
| parent | d5be45ea2436cdc45f086b54516157b5b2394715 (diff) | |
| download | xine-lib-8ff78df42588e88762aaf1581f0e86a270f4a59d.tar.gz xine-lib-8ff78df42588e88762aaf1581f0e86a270f4a59d.tar.bz2 | |
Merge from 1.1.
--HG--
rename : include/xine.h.in => include/xine.h
rename : src/xine-utils/attributes.h => include/xine/attributes.h
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c
Diffstat (limited to 'src/combined')
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 2 | ||||
| -rw-r--r-- | src/combined/flac_decoder.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index db1e5a9c1..b278f991f 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -383,7 +383,7 @@ static void init_video_codec (ff_video_decoder_t *this, unsigned int codec_type) /* Some codecs (eg rv10) copy flags in init so it's necessary to set * this flag here in case we are going to use direct rendering */ - if(this->codec->capabilities & CODEC_CAP_DR1) { + if(this->codec->capabilities & CODEC_CAP_DR1 && this->codec->id != CODEC_ID_H264) { this->context->flags |= CODEC_FLAG_EMU_EDGE; } diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c index 43bad327e..a2631cdc6 100644 --- a/src/combined/flac_decoder.c +++ b/src/combined/flac_decoder.c @@ -158,6 +158,7 @@ flac_write_callback (const FLAC__StreamDecoder *decoder, return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; } +#ifdef LEGACY_FLAC static void flac_metadata_callback (const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, @@ -180,6 +181,7 @@ flac_metadata_callback (const FLAC__StreamDecoder *decoder, return; } +#endif static void flac_error_callback (const FLAC__StreamDecoder *decoder, |