[FFmpeg-cvslog] Use the correct pix_fmt for 32bit x11grab.

Carl Eugen Hoyos git at videolan.org
Thu Feb 2 14:02:29 CET 2012


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Feb  2 13:29:14 2012 +0100| [de05e41bfc0ae32b93e45d2b4c215d89f06f3d8f] | committer: Carl Eugen Hoyos

Use the correct pix_fmt for 32bit x11grab.

Remove adding a constant value to each pixel to make it opaque.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de05e41bfc0ae32b93e45d2b4c215d89f06f3d8f
---

 libavdevice/x11grab.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 722f00f..80a1baf 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -295,7 +295,7 @@ x11grab_read_header(AVFormatContext *s1)
         }
         break;
     case 32:
-        input_pixfmt = PIX_FMT_RGB32;
+        input_pixfmt = PIX_FMT_0RGB32;
         break;
     default:
         av_log(s1, AV_LOG_ERROR, "image depth %i not supported ... aborting\n", image->bits_per_pixel);
@@ -539,8 +539,6 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
             av_log (s1, AV_LOG_INFO, "XGetZPixmap() failed\n");
         }
     }
-    if (image->bits_per_pixel == 32)
-        XAddPixel(image, 0xFF000000);
 
     if (s->draw_mouse) {
         paint_mouse_pointer(image, s);



More information about the ffmpeg-cvslog mailing list