diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-01-19 15:40:06 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-01-19 15:40:06 +0000 |
| commit | 0e5f8ab165de3b5419bd8bba3ae338bc03be94a0 (patch) | |
| tree | 7407644fe690c1084d0fbabc428ce69887cb8a1d | |
| parent | 6b026927919097153e46b8abb51c4d3b89b827b7 (diff) | |
| download | ffmpeg-0e5f8ab165de3b5419bd8bba3ae338bc03be94a0.tar.gz | |
fixed imlib2.c pixel format (imlib2 seems to use CPU endianness in RGBA32 as libavcodec)
Originally committed as revision 1471 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | vhook/imlib2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vhook/imlib2.c b/vhook/imlib2.c index 576b45d004..7da3586fee 100644 --- a/vhook/imlib2.c +++ b/vhook/imlib2.c @@ -210,9 +210,9 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, imlib_context_set_image(image); data = imlib_image_get_data(); - if (pix_fmt != PIX_FMT_BGRA32) { - avpicture_fill(&picture1, (UINT8 *) data, PIX_FMT_BGRA32, width, height); - if (img_convert(&picture1, PIX_FMT_BGRA32, + if (pix_fmt != PIX_FMT_RGBA32) { + avpicture_fill(&picture1, (UINT8 *) data, PIX_FMT_RGBA32, width, height); + if (img_convert(&picture1, PIX_FMT_RGBA32, picture, pix_fmt, width, height) < 0) { goto done; } @@ -264,9 +264,9 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, } } - if (pix_fmt != PIX_FMT_BGRA32) { + if (pix_fmt != PIX_FMT_RGBA32) { if (img_convert(picture, pix_fmt, - &picture1, PIX_FMT_BGRA32, width, height) < 0) { + &picture1, PIX_FMT_RGBA32, width, height) < 0) { } } |