virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avfilter/vf_showinfo: add a \n for end of ERROR and WARNNING log

Browse Source 
Note for info level, one extra \n will be print after the log.

Reviewed-by:   Paul B Mahol <onemda@gmail.com>
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
This commit is contained in:
Limin Wang
2020-06-26 19:10:47 +08:00
parent d7ad70e33b
commit 12c42c709e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/vf_showinfo.c
View File

@@ -64,7 +64,7 @@ static void dump_spherical(AVFilterContext *ctx, AVFrame *frame, AVFrameSideData
av_log(ctx, AV_LOG_INFO, "spherical information: "); av_log(ctx, AV_LOG_INFO, "spherical information: ");
if (sd->size < sizeof(*spherical)) { if (sd->size < sizeof(*spherical)) {
av_log(ctx, AV_LOG_ERROR, "invalid data"); av_log(ctx, AV_LOG_ERROR, "invalid data\n");
return; return;
} }
@@ -75,7 +75,7 @@ static void dump_spherical(AVFilterContext *ctx, AVFrame *frame, AVFrameSideData
else if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE) else if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE)
av_log(ctx, AV_LOG_INFO, "tiled equirectangular "); av_log(ctx, AV_LOG_INFO, "tiled equirectangular ");
else { else {
av_log(ctx, AV_LOG_WARNING, "unknown"); av_log(ctx, AV_LOG_WARNING, "unknown\n");
return; return;
} }
@@ -102,7 +102,7 @@ static void dump_stereo3d(AVFilterContext *ctx, AVFrameSideData *sd)
av_log(ctx, AV_LOG_INFO, "stereoscopic information: "); av_log(ctx, AV_LOG_INFO, "stereoscopic information: ");
if (sd->size < sizeof(*stereo)) { if (sd->size < sizeof(*stereo)) {
av_log(ctx, AV_LOG_ERROR, "invalid data"); av_log(ctx, AV_LOG_ERROR, "invalid data\n");
return; return;
} }
@@ -123,7 +123,7 @@ static void dump_roi(AVFilterContext *ctx, AVFrameSideData *sd)
roi = (const AVRegionOfInterest *)sd->data; roi = (const AVRegionOfInterest *)sd->data;
roi_size = roi->self_size; roi_size = roi->self_size;
if (!roi_size || sd->size % roi_size != 0) { if (!roi_size || sd->size % roi_size != 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid AVRegionOfInterest.self_size."); av_log(ctx, AV_LOG_ERROR, "Invalid AVRegionOfInterest.self_size.\n");
return; return;
} }
nb_rois = sd->size / roi_size; nb_rois = sd->size / roi_size;
@@ -142,7 +142,7 @@ static void dump_mastering_display(AVFilterContext *ctx, AVFrameSideData *sd)
av_log(ctx, AV_LOG_INFO, "mastering display: "); av_log(ctx, AV_LOG_INFO, "mastering display: ");
if (sd->size < sizeof(*mastering_display)) { if (sd->size < sizeof(*mastering_display)) {
av_log(ctx, AV_LOG_ERROR, "invalid data"); av_log(ctx, AV_LOG_ERROR, "invalid data\n");
return; return;
} }
@@ -197,7 +197,7 @@ static void dump_sei_unregistered_metadata(AVFilterContext *ctx, AVFrameSideData
int i; int i;
if (sd->size < uuid_size) { if (sd->size < uuid_size) {
av_log(ctx, AV_LOG_ERROR, "invalid data(%d < UUID(%d-bytes))", sd->size, uuid_size); av_log(ctx, AV_LOG_ERROR, "invalid data(%d < UUID(%d-bytes))\n", sd->size, uuid_size);
return; return;
} }
@@ -367,7 +367,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
uint32_t *tc = (uint32_t*)sd->data; uint32_t *tc = (uint32_t*)sd->data;
int m = FFMIN(tc[0],3); int m = FFMIN(tc[0],3);
if (sd->size != 16) { if (sd->size != 16) {
av_log(ctx, AV_LOG_ERROR, "invalid data"); av_log(ctx, AV_LOG_ERROR, "invalid data\n");
break; break;
} }
for (int j = 1; j <= m; j++) { for (int j = 1; j <= m; j++) {
@@ -406,7 +406,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
dump_sei_unregistered_metadata(ctx, sd); dump_sei_unregistered_metadata(ctx, sd);
break; break;
default: default:
av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)", av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)\n",
sd->type, sd->size); sd->type, sd->size);
break; break;
} }