mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2026-06-19 19:03:00 +02:00
* UINTX -> uintx_t INTX -> intx_t
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
+4
-4
@@ -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;
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user