mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-27 05:00:37 +00:00
Replace forbidden exit() by return() Víctor Paesa, wzrlpy arsystel com.
Originally committed as revision 8592 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
f321635a6e
commit
ca345e442d
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user