diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2009-11-27 18:56:30 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-11-27 18:56:30 +0000 |
| commit | a5a61fac3b5897552b5d017b427786bb5fa4368c (patch) | |
| tree | aa6887a5499f8de4713c9803ca57b7c1a75d49e3 /libavdevice | |
| parent | 781c1aa6dce63a6c351bdf35ef6dea78805d5b5d (diff) | |
| download | ffmpeg-a5a61fac3b5897552b5d017b427786bb5fa4368c.tar.gz | |
Remove unused stuff.
Originally committed as revision 20632 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/x11grab.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index c564d66692..3f052fb3da 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -65,7 +65,6 @@ struct x11_grab XImage *image; /**< X11 image holding the grab */ int use_shm; /**< !0 when using XShm extension */ XShmSegmentInfo shminfo; /**< When using XShm, keeps track of XShm infos */ - int mouse_warning_shown; }; /** @@ -222,7 +221,6 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) x11grab->y_off = y_off; x11grab->image = image; x11grab->use_shm = use_shm; - x11grab->mouse_warning_shown = 0; st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_RAWVIDEO; @@ -236,33 +234,6 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) } /** - * Mouse painting helper function that applies an 'and' and 'or' mask pair to - * '*dst' pixel. It actually draws a mouse pointer pixel to grabbed frame. - * - * @param dst Destination pixel - * @param and Part of the mask that must be applied using a bitwise 'and' - * operator - * @param or Part of the mask that must be applied using a bitwise 'or' - * operator - * @param bits_per_pixel Bits per pixel used in the grabbed image - */ -static void inline -apply_masks(uint8_t *dst, int and, int or, int bits_per_pixel) -{ - switch (bits_per_pixel) { - case 32: - *(uint32_t*)dst = (*(uint32_t*)dst & and) | or; - break; - case 16: - *(uint16_t*)dst = (*(uint16_t*)dst & and) | or; - break; - case 8: - *dst = !!or; - break; - } -} - -/** * Paints a mouse pointer in an X11 image. * * @param image image to paint the mouse pointer to |