diff options
| author | Torsten Jager <t.jager@gmx.de> | 2013-11-28 18:50:15 +0100 |
|---|---|---|
| committer | Torsten Jager <t.jager@gmx.de> | 2013-11-28 18:50:15 +0100 |
| commit | b5539e68ad9a8fc8980fe2d5068cc05939c0091c (patch) | |
| tree | 8ebb21c19c7eb89a043637fe9de5849f4f9fcf54 | |
| parent | 44ea02ff234556810628747aff3d2eeb0da34d6b (diff) | |
| download | xine-lib-b5539e68ad9a8fc8980fe2d5068cc05939c0091c.tar.gz xine-lib-b5539e68ad9a8fc8980fe2d5068cc05939c0091c.tar.bz2 | |
ff_video_decoder.c: cosmetics (fix source view folding).
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index dc3a3f2e4..b5f7631f8 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -1905,9 +1905,11 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { /* prepare for colorspace conversion */ #ifdef ENABLE_VAAPI - if (this->context->pix_fmt != PIX_FMT_VAAPI_VLD) { + if (this->context->pix_fmt != PIX_FMT_VAAPI_VLD && !this->cs_convert_init) +#else + if (!this->cs_convert_init) #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: @@ -1925,9 +1927,6 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { } 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; |