diff options
| author | Torsten Jager <t.jager@gmx.de> | 2013-01-30 22:00:30 +0200 |
|---|---|---|
| committer | Torsten Jager <t.jager@gmx.de> | 2013-01-30 22:00:30 +0200 |
| commit | d27acda147735d7d2fbfb86d83dadec8748f5a67 (patch) | |
| tree | 60045f962e4c1926242349c5b12fc839ba1d07b0 | |
| parent | aa1950bf3792cfe5383ea3ebeaeb7e1dd9c8dca0 (diff) | |
| download | xine-lib-d27acda147735d7d2fbfb86d83dadec8748f5a67.tar.gz xine-lib-d27acda147735d7d2fbfb86d83dadec8748f5a67.tar.bz2 | |
ff_video_decoder: fix VAAPI decoding
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 94d8d1c9c..670ccce26 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -1662,7 +1662,11 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { /* indirect rendering */ /* prepare for colorspace conversion */ - if (!this->cs_convert_init && !this->context->pix_fmt != PIX_FMT_VAAPI_VLD) { +#ifdef ENABLE_VAAPI + if (this->context->pix_fmt != PIX_FMT_VAAPI_VLD) { +#endif + if (!this->cs_convert_init) { + xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "ff_video_dec: PIX_FMT %d\n", this->context->pix_fmt); switch (this->context->pix_fmt) { case PIX_FMT_ARGB: case PIX_FMT_BGRA: @@ -1675,11 +1679,13 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { case PIX_FMT_PAL8: this->output_format = XINE_IMGFMT_YUY2; break; - default: - this->output_format = XINE_IMGFMT_YV12; + default: ; } this->cs_convert_init = 1; } +#ifdef ENABLE_VAAPI + } +#endif if (this->aspect_ratio_prio == 0) { this->aspect_ratio = (double)this->bih.biWidth / (double)this->bih.biHeight; |