har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RFC 3&4 stage: FFmpeg style aint't my style

Browse Source 
- Tabs are 4 width
- No tabs allowed
(patch by Edouard Gomez)

Originally committed as revision 7306 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Edouard Gomez 2006-12-13 08:48:56 +00:00 committed by Guillaume Poirier
parent ef84bf0404
commit aac105fcd1
1 changed files with 339 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/x11grab.c
View File

@ -242,12 +242,12 @@ getCurrentPointer(AVFormatContext *s1, X11Grab *s, int *x, int *y)
} }
#define DRAW_CURSOR_TEMPLATE(type_t) \ #define DRAW_CURSOR_TEMPLATE(type_t) \
do { \ do { \
type_t *cursor; \ type_t *cursor; \
int width_cursor; \ int width_cursor; \
uint16_t bm_b, bm_w, mask; \ uint16_t bm_b, bm_w, mask; \
\ \
for (line = 0; line < min(20, (y_off + height) - *y); line++ ) { \ for (line = 0; line < min(20, (y_off + height) - *y); line++ ) { \
if (s->mouse_wanted == 1) { \ if (s->mouse_wanted == 1) { \
bm_b = mousePointerBlack[line]; \ bm_b = mousePointerBlack[line]; \
bm_w = mousePointerWhite[line]; \ bm_w = mousePointerWhite[line]; \
@ -256,7 +256,7 @@ for (line = 0; line < min(20, (y_off + height) - *y); line++ ) { \
bm_w = mousePointerBlack[line]; \ bm_w = mousePointerBlack[line]; \
} \ } \
mask = ( 0x0001 << 15 ); \ mask = ( 0x0001 << 15 ); \
\ \
for (cursor = (type_t*) im_data, width_cursor = 0; \ for (cursor = (type_t*) im_data, width_cursor = 0; \
((width_cursor + *x) < (width + x_off) && width_cursor < 16); \ ((width_cursor + *x) < (width + x_off) && width_cursor < 16); \
cursor++, width_cursor++) { \ cursor++, width_cursor++) { \
@ -268,8 +268,8 @@ for (line = 0; line < min(20, (y_off + height) - *y); line++ ) { \
mask >>= 1; \ mask >>= 1; \
} \ } \
im_data += image->bytes_per_line; \ im_data += image->bytes_per_line; \
} \ } \
} while (0) } while (0)
static void static void
paintMousePointer(AVFormatContext *s1, X11Grab *s, int *x, int *y, XImage *image) paintMousePointer(AVFormatContext *s1, X11Grab *s, int *x, int *y, XImage *image)