diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-09-23 10:33:42 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-09-23 10:33:42 +0000 |
| commit | bb4a87727b5f3c02e604b2f3b823ab8d42a7f176 (patch) | |
| tree | e1b998de77842c88b21933a47b9e7a8ed0d72cbe | |
| parent | b43b426a8bc11da50db36e4797142da17f75d86f (diff) | |
| download | ffmpeg-bb4a87727b5f3c02e604b2f3b823ab8d42a7f176.tar.gz | |
imlib2 vhook rgba fix by ("Todd.Kirby" <doubleshot at pacbell dot net>)
Originally committed as revision 3498 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | vhook/imlib2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vhook/imlib2.c b/vhook/imlib2.c index 4e890e14e7..4465cc3975 100644 --- a/vhook/imlib2.c +++ b/vhook/imlib2.c @@ -213,14 +213,14 @@ 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_RGBA32) { avpicture_fill(&picture1, (uint8_t *) data, PIX_FMT_RGBA32, width, height); + if (pix_fmt != PIX_FMT_RGBA32) { if (img_convert(&picture1, PIX_FMT_RGBA32, picture, pix_fmt, width, height) < 0) { goto done; } } else { - av_abort(); + img_copy(&picture1, picture, PIX_FMT_RGBA32, width, height); } imlib_image_set_has_alpha(0); @@ -271,6 +271,8 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, if (img_convert(picture, pix_fmt, &picture1, PIX_FMT_RGBA32, width, height) < 0) { } + } else { + img_copy(picture, &picture1, PIX_FMT_RGBA32, width, height); } done: |