diff options
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/src_movie.c | 3 | ||||
| -rw-r--r-- | libavfilter/vf_histeq.c | 5 | ||||
| -rw-r--r-- | libavfilter/vf_palettegen.c | 5 | ||||
| -rw-r--r-- | libavfilter/vf_paletteuse.c | 3 | ||||
| -rw-r--r-- | libavfilter/vsrc_cellauto.c | 3 | ||||
| -rw-r--r-- | libavfilter/vsrc_life.c | 3 |
6 files changed, 14 insertions, 8 deletions
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 908c03e1d3..a7024b9d45 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -35,6 +35,7 @@ #include "libavutil/avassert.h" #include "libavutil/opt.h" #include "libavutil/imgutils.h" +#include "libavutil/internal.h" #include "libavutil/timestamp.h" #include "libavformat/avformat.h" #include "audio.h" @@ -536,7 +537,7 @@ static int movie_push_frame(AVFilterContext *ctx, unsigned out_id) } frame->pts = av_frame_get_best_effort_timestamp(frame); - av_dlog(ctx, "movie_push_frame(): file:'%s' %s\n", movie->file_name, + ff_dlog(ctx, "movie_push_frame(): file:'%s' %s\n", movie->file_name, describe_frame_to_str((char[1024]){0}, 1024, frame, frame_type, outlink)); if (st->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { diff --git a/libavfilter/vf_histeq.c b/libavfilter/vf_histeq.c index ce28afdad6..b3d2545b9f 100644 --- a/libavfilter/vf_histeq.c +++ b/libavfilter/vf_histeq.c @@ -28,6 +28,7 @@ */ #include "libavutil/common.h" +#include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" @@ -168,7 +169,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic) #ifdef DEBUG for (x = 0; x < 256; x++) - av_dlog(ctx, "in[%d]: %u\n", x, histeq->in_histogram[x]); + ff_dlog(ctx, "in[%d]: %u\n", x, histeq->in_histogram[x]); #endif /* Calculate the lookup table. */ @@ -244,7 +245,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic) } #ifdef DEBUG for (x = 0; x < 256; x++) - av_dlog(ctx, "out[%d]: %u\n", x, histeq->out_histogram[x]); + ff_dlog(ctx, "out[%d]: %u\n", x, histeq->out_histogram[x]); #endif av_frame_free(&inpic); diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c index 4b49058b35..4e7cb8ad2f 100644 --- a/libavfilter/vf_palettegen.c +++ b/libavfilter/vf_palettegen.c @@ -24,6 +24,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/qsort.h" #include "avfilter.h" @@ -347,7 +348,7 @@ static AVFrame *get_palette_frame(AVFilterContext *ctx) if (rr >= gr && rr >= br) longest = 0; if (gr >= rr && gr >= br) longest = 1; // prefer green again - av_dlog(ctx, "box #%02X [%6d..%-6d] (%6d) w:%-6"PRIu64" ranges:[%2x %2x %2x] sort by %c (already sorted:%c) ", + ff_dlog(ctx, "box #%02X [%6d..%-6d] (%6d) w:%-6"PRIu64" ranges:[%2x %2x %2x] sort by %c (already sorted:%c) ", box_id, box->start, box->start + box->len - 1, box->len, box_weight, rr, gr, br, "rgb"[longest], box->sorted_by == longest ? 'y':'n'); @@ -368,7 +369,7 @@ static AVFrame *get_palette_frame(AVFilterContext *ctx) if (box_weight > median) break; } - av_dlog(ctx, "split @ i=%-6d with w=%-6"PRIu64" (target=%6"PRIu64")\n", i, box_weight, median); + ff_dlog(ctx, "split @ i=%-6d with w=%-6"PRIu64" (target=%6"PRIu64")\n", i, box_weight, median); split_box(s, box, i); box_id = get_next_box_id_to_split(s); diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index 8835d8b21c..9067d6d33c 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -24,6 +24,7 @@ */ #include "libavutil/bprint.h" +#include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/qsort.h" #include "dualinput.h" @@ -875,7 +876,7 @@ static AVFrame *apply_palette(AVFilterLink *inlink, AVFrame *in) return NULL; } - av_dlog(ctx, "%dx%d rect: (%d;%d) -> (%d,%d) [area:%dx%d]\n", + ff_dlog(ctx, "%dx%d rect: (%d;%d) -> (%d,%d) [area:%dx%d]\n", w, h, x, y, x+w, y+h, in->width, in->height); if (s->set_frame(s, out, in, x, y, w, h) < 0) { diff --git a/libavfilter/vsrc_cellauto.c b/libavfilter/vsrc_cellauto.c index 4f4b01c60d..facafc7a71 100644 --- a/libavfilter/vsrc_cellauto.c +++ b/libavfilter/vsrc_cellauto.c @@ -26,6 +26,7 @@ /* #define DEBUG */ #include "libavutil/file.h" +#include "libavutil/internal.h" #include "libavutil/lfg.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" @@ -249,7 +250,7 @@ static void evolve(AVFilterContext *ctx) v|= i+1 < cellauto->w ? prev_row[i+1] : 0; } row[i] = !!(cellauto->rule & (1<<v)); - av_dlog(ctx, "i:%d context:%c%c%c -> cell:%d\n", i, + ff_dlog(ctx, "i:%d context:%c%c%c -> cell:%d\n", i, v&4?'@':' ', v&2?'@':' ', v&1?'@':' ', row[i]); } diff --git a/libavfilter/vsrc_life.c b/libavfilter/vsrc_life.c index 47630add7d..2c2baf274c 100644 --- a/libavfilter/vsrc_life.c +++ b/libavfilter/vsrc_life.c @@ -26,6 +26,7 @@ /* #define DEBUG */ #include "libavutil/file.h" +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/lfg.h" #include "libavutil/opt.h" @@ -334,7 +335,7 @@ static void evolve(AVFilterContext *ctx) if (alive) *newbuf = ALIVE_CELL; // new cell is alive else if (cell) *newbuf = cell - 1; // new cell is dead and in the process of mold else *newbuf = 0; // new cell is definitely dead - av_dlog(ctx, "i:%d j:%d live_neighbors:%d cell:%d -> cell:%d\n", i, j, n, cell, *newbuf); + ff_dlog(ctx, "i:%d j:%d live_neighbors:%d cell:%d -> cell:%d\n", i, j, n, cell, *newbuf); newbuf++; } } |