diff options
| author | Alexis Ballier <aballier@gentoo.org> | 2009-03-08 20:30:50 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-03-08 20:30:50 +0100 |
| commit | e2e4a31eef68c45ed4954d25b6b92eabbafef2ce (patch) | |
| tree | e630af09e1782d0cb1c889a74b01028c56e755f1 | |
| parent | 7c9b436f8f40aa3f2f75bf2ecad543758d897330 (diff) | |
| download | xine-lib-e2e4a31eef68c45ed4954d25b6b92eabbafef2ce.tar.gz xine-lib-e2e4a31eef68c45ed4954d25b6b92eabbafef2ce.tar.bz2 | |
Fix build with libavutil >= 50.0.0
PIX_FMT_RGBA32 was #defined to PIX_FMT_RGB32 since 2006.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -5,6 +5,7 @@ xine-lib (1.1.17) 2009-??-?? * Fix a build failure on *BSD due to some rather useful GNUisms. * Protect audio loop so it cannot write to a paused device (fix pause/resume freeze with pulseaudio). + * Fix build with libavutil >= 50.0.0. xine-lib (1.1.16.2) 2009-02-10 * Build fixes related to ImageMagick 6.4 & later. diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index e119b2b21..c272bc91a 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -588,7 +588,7 @@ static void ff_convert_frame(ff_video_decoder_t *this, vo_frame_t *img) { img->width, this->bih.biHeight); - } else if (this->context->pix_fmt == PIX_FMT_RGBA32) { + } else if (this->context->pix_fmt == PIX_FMT_RGB32) { int x, plane_ptr = 0; uint32_t *argb_pixels; @@ -1304,7 +1304,7 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { /* initialize the colorspace converter */ if (!this->cs_convert_init) { - if ((this->context->pix_fmt == PIX_FMT_RGBA32) || + if ((this->context->pix_fmt == PIX_FMT_RGB32) || (this->context->pix_fmt == PIX_FMT_RGB565) || (this->context->pix_fmt == PIX_FMT_RGB555) || (this->context->pix_fmt == PIX_FMT_BGR24) || |