diff options
| author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-02-11 16:35:48 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-02-11 16:35:48 +0000 |
| commit | 0c1a9edad463bd6e22b30c19b700b099c7093fc1 (patch) | |
| tree | d16ccbe29c8dbfc2cdc4e92cac31b22c181ed940 /vhook | |
| parent | 4596673c062e3834b6d31d1e8e210b64d74ce26b (diff) | |
| download | ffmpeg-0c1a9edad463bd6e22b30c19b700b099c7093fc1.tar.gz | |
* UINTX -> uintx_t INTX -> intx_t
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'vhook')
| -rw-r--r-- | vhook/fish.c | 8 | ||||
| -rw-r--r-- | vhook/imlib2.c | 4 | ||||
| -rw-r--r-- | vhook/null.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/vhook/fish.c b/vhook/fish.c index 1e75e9c658..15486d79a9 100644 --- a/vhook/fish.c +++ b/vhook/fish.c @@ -68,7 +68,7 @@ typedef struct { int file_limit; int debug; int min_interval; - INT64 next_pts; + int64_t next_pts; int inset; int min_width; } ContextInfo; @@ -193,10 +193,10 @@ static void get_hsv(HSV *hsv, int r, int g, int b) return; } -void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, int height, INT64 pts) +void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, int height, int64_t pts) { ContextInfo *ci = (ContextInfo *) ctx; - UINT8 *cm = cropTbl + MAX_NEG_CROP; + uint8_t *cm = cropTbl + MAX_NEG_CROP; int rowsize = picture->linesize[0]; if (pts < ci->next_pts) @@ -208,7 +208,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, ci->next_pts = pts + 1000000; if (pix_fmt == PIX_FMT_YUV420P) { - UINT8 *y, *u, *v; + uint8_t *y, *u, *v; int width2 = width >> 1; int inrange = 0; int pixcnt; diff --git a/vhook/imlib2.c b/vhook/imlib2.c index 6c6707b78b..d569c808d6 100644 --- a/vhook/imlib2.c +++ b/vhook/imlib2.c @@ -193,7 +193,7 @@ static void put_cached_image(ContextInfo *ci, Imlib_Image image, int width, int ci->cache = cache; } -void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, int height, INT64 pts) +void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, int height, int64_t pts) { ContextInfo *ci = (ContextInfo *) ctx; AVPicture picture1; @@ -211,7 +211,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, data = imlib_image_get_data(); if (pix_fmt != PIX_FMT_RGBA32) { - avpicture_fill(&picture1, (UINT8 *) data, PIX_FMT_RGBA32, width, height); + avpicture_fill(&picture1, (uint8_t *) data, PIX_FMT_RGBA32, width, height); if (img_convert(&picture1, PIX_FMT_RGBA32, picture, pix_fmt, width, height) < 0) { goto done; diff --git a/vhook/null.c b/vhook/null.c index da35d6e845..24217e5ddb 100644 --- a/vhook/null.c +++ b/vhook/null.c @@ -41,7 +41,7 @@ int Configure(void **ctxp, int argc, char *argv[]) return 0; } -void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, int height, INT64 pts) +void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, int height, int64_t pts) { ContextInfo *ci = (ContextInfo *) ctx; char *buf = 0; |