diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-06 01:50:55 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-06 01:50:55 +0000 |
| commit | 66f60ab3969928227bd0fa57df451e7bc58f2ff7 (patch) | |
| tree | 7ca844a04f03d4f73f24202d7d92aa7aca018931 /src/combined/ffmpeg/ff_video_decoder.c | |
| parent | b261d83b69692cfa13aada3266f3c832861a48a8 (diff) | |
| parent | fd6d1cc6ccda5ff8319ae0eb8417c5db5700938a (diff) | |
| download | xine-lib-66f60ab3969928227bd0fa57df451e7bc58f2ff7.tar.gz xine-lib-66f60ab3969928227bd0fa57df451e7bc58f2ff7.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/combined/decoder_wavpack.c => src/combined/wavpack_decoder.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'src/combined/ffmpeg/ff_video_decoder.c')
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 726945acd..aaec97ccd 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -346,8 +346,9 @@ static void init_video_codec (ff_video_decoder_t *this, unsigned int codec_type) } if (this->class->thread_count > 1) { - avcodec_thread_init(this->context, this->class->thread_count); - this->context->thread_count = this->class->thread_count; + if (this->codec->id != CODEC_ID_SVQ3 + && avcodec_thread_init(this->context, this->class->thread_count) != -1) + this->context->thread_count = this->class->thread_count; } this->context->skip_loop_filter = skip_loop_filter_enum_values[this->class->skip_loop_filter_enum]; |