diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-16 15:05:19 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-16 15:05:19 +0000 |
| commit | f62eed3209aab6fc642e66b18cc71d526517aadb (patch) | |
| tree | 4b56b352759d4de7196a6ce564cf2ff88dfd08b2 /src/combined/ffmpeg | |
| parent | d8a50c1e20367be95911533c62637c23b809b916 (diff) | |
| parent | c3580b925a6c33105ee483d3c616a16f8ce0bba9 (diff) | |
| download | xine-lib-f62eed3209aab6fc642e66b18cc71d526517aadb.tar.gz xine-lib-f62eed3209aab6fc642e66b18cc71d526517aadb.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libmpeg2new/Makefile.am => src/video_dec/libmpeg2new/Makefile.am
rename : src/libmpeg2new/libmpeg2/Makefile.am => src/video_dec/libmpeg2new/libmpeg2/Makefile.am
Diffstat (limited to 'src/combined/ffmpeg')
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 19e10cbc9..d7e068812 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -579,7 +579,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; @@ -1287,7 +1287,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) || |