RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

imlib2 vhook rgba fix by ("Todd.Kirby" <doubleshot at pacbell dot net>) 

Originally committed as revision 3498 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-09-23 10:33:42 +00:00
parent b43b426a8b
commit bb4a87727b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vhook/imlib2.c
View File

@ -213,14 +213,14 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width,
imlib_context_set_image(image); imlib_context_set_image(image);
data = imlib_image_get_data(); data = imlib_image_get_data();
if (pix_fmt != PIX_FMT_RGBA32) {
avpicture_fill(&picture1, (uint8_t *) data, PIX_FMT_RGBA32, width, height); avpicture_fill(&picture1, (uint8_t *) data, PIX_FMT_RGBA32, width, height);
if (pix_fmt != PIX_FMT_RGBA32) {
if (img_convert(&picture1, PIX_FMT_RGBA32, if (img_convert(&picture1, PIX_FMT_RGBA32,
picture, pix_fmt, width, height) < 0) { picture, pix_fmt, width, height) < 0) {
goto done; goto done;
} }
} else { } else {
av_abort(); img_copy(&picture1, picture, PIX_FMT_RGBA32, width, height);
} }
imlib_image_set_has_alpha(0); 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, if (img_convert(picture, pix_fmt,
&picture1, PIX_FMT_RGBA32, width, height) < 0) { &picture1, PIX_FMT_RGBA32, width, height) < 0) {
} }
} else {
img_copy(picture, &picture1, PIX_FMT_RGBA32, width, height);
} }
done: done: