From ca345e442d121963c7e75bba7a3e70d9f29db5aa Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 1 Apr 2007 17:23:15 +0000 Subject: [PATCH] =?utf8?q?Replace=20forbidden=20exit()=20by=20return()=20V?= =?utf8?q?=C3=ADctor=20Paesa,=20wzrlpy=20arsystel=20com.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Originally committed as revision 8592 to svn://svn.ffmpeg.org/ffmpeg/trunk --- vhook/fish.c | 2 +- vhook/imlib2.c | 4 ++-- vhook/null.c | 4 ++-- vhook/ppm.c | 4 ++-- vhook/watermark.c | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/vhook/fish.c b/vhook/fish.c index 2a30d2847..1571cf9b9 100644 --- a/vhook/fish.c +++ b/vhook/fish.c @@ -354,7 +354,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, if (ci->toRGB_convert_ctx == NULL) { av_log(NULL, AV_LOG_ERROR, "Cannot initialize the toRGB conversion context\n"); - exit(1); + return; } // img_convert parameters are 2 first destination, then 4 source // sws_scale parameters are context, 4 first source, then 2 destination diff --git a/vhook/imlib2.c b/vhook/imlib2.c index 868182de5..4e6ffb67c 100644 --- a/vhook/imlib2.c +++ b/vhook/imlib2.c @@ -350,7 +350,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, if (ci->toRGB_convert_ctx == NULL) { av_log(NULL, AV_LOG_ERROR, "Cannot initialize the toRGB conversion context\n"); - exit(1); + return; } // img_convert parameters are 2 first destination, then 4 source @@ -436,7 +436,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, if (ci->fromRGB_convert_ctx == NULL) { av_log(NULL, AV_LOG_ERROR, "Cannot initialize the fromRGB conversion context\n"); - exit(1); + return; } // img_convert parameters are 2 first destination, then 4 source // sws_scale parameters are context, 4 first source, then 2 destination diff --git a/vhook/null.c b/vhook/null.c index 041e5abda..c93308906 100644 --- a/vhook/null.c +++ b/vhook/null.c @@ -81,7 +81,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, if (ci->toRGB_convert_ctx == NULL) { av_log(NULL, AV_LOG_ERROR, "Cannot initialize the toRGB conversion context\n"); - exit(1); + return; } // img_convert parameters are 2 first destination, then 4 source // sws_scale parameters are context, 4 first source, then 2 destination @@ -102,7 +102,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, if (ci->fromRGB_convert_ctx == NULL) { av_log(NULL, AV_LOG_ERROR, "Cannot initialize the fromRGB conversion context\n"); - exit(1); + return; } // img_convert parameters are 2 first destination, then 4 source // sws_scale parameters are context, 4 first source, then 2 destination diff --git a/vhook/ppm.c b/vhook/ppm.c index 4b3a17f9f..9f618e55b 100644 --- a/vhook/ppm.c +++ b/vhook/ppm.c @@ -266,7 +266,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, if (ci->toRGB_convert_ctx == NULL) { av_log(NULL, AV_LOG_ERROR, "Cannot initialize the toRGB conversion context\n"); - exit(1); + return; } // img_convert parameters are 2 first destination, then 4 source @@ -335,7 +335,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width, if (ci->fromRGB_convert_ctx == NULL) { av_log(NULL, AV_LOG_ERROR, "Cannot initialize the fromRGB conversion context\n"); - exit(1); + return; } // img_convert parameters are 2 first destination, then 4 source diff --git a/vhook/watermark.c b/vhook/watermark.c index db9092ff1..aa6fee63c 100644 --- a/vhook/watermark.c +++ b/vhook/watermark.c @@ -224,7 +224,7 @@ static void Process0(void *ctx, if (ci->toRGB_convert_ctx == NULL) { av_log(NULL, AV_LOG_ERROR, "Cannot initialize the toRGB conversion context\n"); - exit(1); + return; } // img_convert parameters are 2 first destination, then 4 source @@ -299,7 +299,7 @@ static void Process0(void *ctx, if (ci->fromRGB_convert_ctx == NULL) { av_log(NULL, AV_LOG_ERROR, "Cannot initialize the fromRGB conversion context\n"); - exit(1); + return; } // img_convert parameters are 2 first destination, then 4 source // sws_scale parameters are context, 4 first source, then 2 destination @@ -355,7 +355,7 @@ static void Process1(void *ctx, if (ci->toRGB_convert_ctx == NULL) { av_log(NULL, AV_LOG_ERROR, "Cannot initialize the toRGB conversion context\n"); - exit(1); + return; } // img_convert parameters are 2 first destination, then 4 source @@ -410,7 +410,7 @@ static void Process1(void *ctx, if (ci->fromRGB_convert_ctx == NULL) { av_log(NULL, AV_LOG_ERROR, "Cannot initialize the fromRGB conversion context\n"); - exit(1); + return; } // img_convert parameters are 2 first destination, then 4 source // sws_scale parameters are context, 4 first source, then 2 destination @@ -610,7 +610,7 @@ int get_watermark_picture(ContextInfo *ci, int cleanup) if (ci->watermark_convert_ctx == NULL) { av_log(NULL, AV_LOG_ERROR, "Cannot initialize the watermark conversion context\n"); - exit(1); + return -1; } // img_convert parameters are 2 first destination, then 4 source // sws_scale parameters are context, 4 first source, then 2 destination -- 2.11.0