@@ -1151,7 +1151,7 @@ static void do_video_out(AVFormatContext *s,

             ost->forced_keyframes_expr_const_values[FKF_T] = pts_time;

             res = av_expr_eval(ost->forced_keyframes_pexpr,

                                ost->forced_keyframes_expr_const_values, NULL);

-            av_dlog(NULL, "force_key_frame: n:%f n_forced:%f prev_forced_n:%f t:%f prev_forced_t:%f -> res:%f\n",

+            ff_dlog(NULL, "force_key_frame: n:%f n_forced:%f prev_forced_n:%f t:%f prev_forced_t:%f -> res:%f\n",

                     ost->forced_keyframes_expr_const_values[FKF_N],

                     ost->forced_keyframes_expr_const_values[FKF_N_FORCED],

                     ost->forced_keyframes_expr_const_values[FKF_PREV_FORCED_N],

@@ -21,6 +21,7 @@

 #include "avcodec.h"

 #include "ass.h"

+#include "libavutil/internal.h"

 #include "libavutil/opt.h"

 #define SCREEN_ROWS 15

@@ -451,9 +452,9 @@ static void handle_char(CCaptionSubContext *ctx, char hi, char lo, int64_t pts)

     ctx->prev_cmd[0] = 0;

     ctx->prev_cmd[1] = 0;

     if (lo)

-       av_dlog(ctx, "(%c,%c)\n",hi,lo);

+       ff_dlog(ctx, "(%c,%c)\n",hi,lo);

     else

-       av_dlog(ctx, "(%c)\n",hi);

+       ff_dlog(ctx, "(%c)\n",hi);

 }

 static int process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint8_t lo)

@@ -493,21 +494,21 @@ static int process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint8

         ret = handle_edm(ctx, pts);

     } else if ( COR3(hi, 0x14, 0x15, 0x1C) && lo == 0x2D ) {

     /* carriage return */

-        av_dlog(ctx, "carriage return\n");

+        ff_dlog(ctx, "carriage return\n");

         reap_screen(ctx, pts);

         roll_up(ctx);

         ctx->screen_changed = 1;

         ctx->cursor_column = 0;

     } else if ( COR3(hi, 0x14, 0x15, 0x1C) && lo == 0x2F ) {

     /* end of caption */

-        av_dlog(ctx, "handle_eoc\n");

+        ff_dlog(ctx, "handle_eoc\n");

         ret = handle_eoc(ctx, pts);

     } else if (hi>=0x20) {

     /* Standard characters (always in pairs) */

         handle_char(ctx, hi, lo, pts);

     } else {

     /* Ignoring all other non data code */

-        av_dlog(ctx, "Unknown command 0x%hhx 0x%hhx\n", hi, lo);

+        ff_dlog(ctx, "Unknown command 0x%hhx 0x%hhx\n", hi, lo);

     }

     /* set prev command */

@@ -553,7 +554,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp

         {

             int start_time = av_rescale_q(ctx->start_time, avctx->time_base, (AVRational){ 1, 100 });

             int end_time = av_rescale_q(ctx->end_time, avctx->time_base, (AVRational){ 1, 100 });

-            av_dlog(ctx, "cdp writing data (%s)\n",ctx->buffer.str);

+            ff_dlog(ctx, "cdp writing data (%s)\n",ctx->buffer.str);

             ret = ff_ass_add_rect_bprint(sub, &ctx->buffer, start_time, end_time - start_time);

             if (ret < 0)

                 return ret;

@@ -22,6 +22,7 @@

 #include "libavcodec/ass.h"

 #include "libavutil/opt.h"

 #include "libavutil/bprint.h"

+#include "libavutil/internal.h"

 #include "libavutil/intreadwrite.h"

 #include "libavutil/log.h"

@@ -274,7 +275,7 @@ static int gen_sub_bitmap(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_pa

         b = VBI_B(page->color_map[ci]);

         a = VBI_A(page->color_map[ci]);

         ((uint32_t *)sub_rect->pict.data[1])[ci] = RGBA(r, g, b, a);

-        av_dlog(ctx, "palette %0x\n", ((uint32_t *)sub_rect->pict.data[1])[ci]);

+        ff_dlog(ctx, "palette %0x\n", ((uint32_t *)sub_rect->pict.data[1])[ci]);

     }

     ((uint32_t *)sub_rect->pict.data[1])[cmax] = RGBA(0, 0, 0, 0);

     sub_rect->type = SUBTITLE_BITMAP;

@@ -427,7 +428,7 @@ static int teletext_decode_frame(AVCodecContext *avctx, void *data, int *data_si

         if (data_identifier_is_teletext(*pkt->data)) {

             if ((lines = slice_to_vbi_lines(ctx, pkt->data + 1, pkt->size - 1)) < 0)

                 return lines;

-            av_dlog(avctx, "ctx=%p buf_size=%d lines=%u pkt_pts=%7.3f\n",

+            ff_dlog(avctx, "ctx=%p buf_size=%d lines=%u pkt_pts=%7.3f\n",

                     ctx, pkt->size, lines, (double)pkt->pts/90000.0);

             if (lines > 0) {

 #ifdef DEBUG

@@ -517,7 +518,7 @@ static int teletext_close_decoder(AVCodecContext *avctx)

 {

     TeletextContext *ctx = avctx->priv_data;

-    av_dlog(avctx, "lines_total=%u\n", ctx->lines_processed);

+    ff_dlog(avctx, "lines_total=%u\n", ctx->lines_processed);

     while (ctx->nb_pages)

         subtitle_rect_free(&ctx->pages[--ctx->nb_pages].sub_rect);

     av_freep(&ctx->pages);

@@ -28,6 +28,7 @@

 #define LONG_BITSTREAM_READER

+#include "libavutil/internal.h"

 #include "avcodec.h"

 #include "get_bits.h"

 #include "idctdsp.h"

@@ -70,14 +71,14 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,

     const uint8_t *ptr;

     hdr_size = AV_RB16(buf);

-    av_dlog(avctx, "header size %d\n", hdr_size);

+    ff_dlog(avctx, "header size %d\n", hdr_size);

     if (hdr_size > data_size) {

         av_log(avctx, AV_LOG_ERROR, "error, wrong header size\n");

         return AVERROR_INVALIDDATA;

     }

     version = AV_RB16(buf + 2);

-    av_dlog(avctx, "%.4s version %d\n", buf+4, version);

+    ff_dlog(avctx, "%.4s version %d\n", buf+4, version);

     if (version > 1) {

         av_log(avctx, AV_LOG_ERROR, "unsupported version: %d\n", version);

         return AVERROR_PATCHWELCOME;

@@ -100,7 +101,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,

     }

     if (avctx->skip_alpha) ctx->alpha_info = 0;

-    av_dlog(avctx, "frame type %d\n", ctx->frame_type);

+    ff_dlog(avctx, "frame type %d\n", ctx->frame_type);

     if (ctx->frame_type == 0) {

         ctx->scan = ctx->progressive_scan; // permuted

@@ -118,7 +119,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,

     ptr   = buf + 20;

     flags = buf[19];

-    av_dlog(avctx, "flags %x\n", flags);

+    ff_dlog(avctx, "flags %x\n", flags);

     if (flags & 2) {

         if(buf + data_size - ptr < 64) {

@@ -30,6 +30,7 @@

 #include "libavutil/bprint.h"

 #include "libavutil/channel_layout.h"

 #include "libavutil/file.h"

+#include "libavutil/internal.h"

 #include "libavutil/log.h"

 #include "libavutil/mem.h"

 #include "libavutil/opt.h"

@@ -406,13 +407,13 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt)

         ret = av_buffersink_get_frame_flags(lavfi->sinks[i], frame,

                                             AV_BUFFERSINK_FLAG_PEEK);

         if (ret == AVERROR_EOF) {

-            av_dlog(avctx, "EOF sink_idx:%d\n", i);

+            ff_dlog(avctx, "EOF sink_idx:%d\n", i);

             lavfi->sink_eof[i] = 1;

             continue;

         } else if (ret < 0)

             return ret;

         d = av_rescale_q_rnd(frame->pts, tb, AV_TIME_BASE_Q, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX);

-        av_dlog(avctx, "sink_idx:%d time:%f\n", i, d);

+        ff_dlog(avctx, "sink_idx:%d time:%f\n", i, d);

         av_frame_unref(frame);

         if (d < min_pts) {

@@ -423,7 +424,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt)

     if (min_pts == DBL_MAX)

         return AVERROR_EOF;

-    av_dlog(avctx, "min_pts_sink_idx:%i\n", min_pts_sink_idx);

+    ff_dlog(avctx, "min_pts_sink_idx:%i\n", min_pts_sink_idx);

     av_buffersink_get_frame_flags(lavfi->sinks[min_pts_sink_idx], frame, 0);

     stream_idx = lavfi->sink_stream_map[min_pts_sink_idx];

@@ -25,6 +25,7 @@

 #include "config.h"

 #include "libavutil/rational.h"

 #include "libavutil/imgutils.h"

+#include "libavutil/internal.h"

 #include "libavutil/log.h"

 #include "libavutil/opt.h"

 #include "libavformat/internal.h"

@@ -151,7 +152,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)

     ioctl(video_fd, VIDIOCSAUDIO, &audio);

     ioctl(video_fd, VIDIOCGPICT, &pict);

-    av_dlog(s1, "v4l: colour=%d hue=%d brightness=%d constrast=%d whiteness=%d\n",

+    ff_dlog(s1, "v4l: colour=%d hue=%d brightness=%d constrast=%d whiteness=%d\n",

             pict.colour, pict.hue, pict.brightness, pict.contrast, pict.whiteness);

     /* try to choose a suitable video format */

     pict.palette = desired_palette;

@@ -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) {

@@ -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);

@@ -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);

@@ -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) {

@@ -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]);

     }

@@ -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++;

         }

     }

@@ -29,6 +29,7 @@

 #include "mpegts.h"

 #include "libavformat/avlanguage.h"

 #include "libavutil/avstring.h"

+#include "libavutil/internal.h"

 #include "libavutil/intreadwrite.h"

 #include "libavutil/dict.h"

 #include "libavutil/avassert.h"

@@ -618,7 +619,7 @@ static int write_skip_frames(AVFormatContext *s, int stream_index, int64_t dts)

     AVIStream *avist    = s->streams[stream_index]->priv_data;

     AVCodecContext *enc = s->streams[stream_index]->codec;

-    av_dlog(s, "dts:%s packet_count:%d stream_index:%d\n", av_ts2str(dts), avist->packet_count, stream_index);

+    ff_dlog(s, "dts:%s packet_count:%d stream_index:%d\n", av_ts2str(dts), avist->packet_count, stream_index);

     while (enc->block_align == 0 && dts != AV_NOPTS_VALUE &&

            dts > avist->packet_count && enc->codec_id != AV_CODEC_ID_XSUB && avist->packet_count) {

         AVPacket empty_packet;

@@ -633,7 +634,7 @@ static int write_skip_frames(AVFormatContext *s, int stream_index, int64_t dts)

         empty_packet.data         = NULL;

         empty_packet.stream_index = stream_index;

         avi_write_packet(s, &empty_packet);

-        av_dlog(s, "dup dts:%s packet_count:%d\n", av_ts2str(dts), avist->packet_count);

+        ff_dlog(s, "dup dts:%s packet_count:%d\n", av_ts2str(dts), avist->packet_count);

     }

     return 0;

@@ -21,6 +21,7 @@

 #include <stdint.h>

+#include "libavutil/internal.h"

 #include "libavutil/intreadwrite.h"

 #include "libavutil/intfloat.h"

 #include "libavutil/opt.h"

@@ -160,7 +161,7 @@ static int64_t ffm_seek1(AVFormatContext *s, int64_t pos1)

     pos = FFMIN(pos1, ffm->file_size - FFM_PACKET_SIZE);

     pos = FFMAX(pos, FFM_PACKET_SIZE);

-    av_dlog(s, "seek to %"PRIx64" -> %"PRIx64"\n", pos1, pos);

+    ff_dlog(s, "seek to %"PRIx64" -> %"PRIx64"\n", pos1, pos);

     return avio_seek(pb, pos, SEEK_SET);

 }

@@ -172,7 +173,7 @@ static int64_t get_dts(AVFormatContext *s, int64_t pos)

     ffm_seek1(s, pos);

     avio_skip(pb, 4);

     dts = avio_rb64(pb);

-    av_dlog(s, "dts=%0.6f\n", dts / 1000000.0);

+    ff_dlog(s, "dts=%0.6f\n", dts / 1000000.0);

     return dts;

 }

@@ -608,7 +609,7 @@ static int ffm_read_packet(AVFormatContext *s, AVPacket *pkt)

         if ((ret = ffm_is_avail_data(s, FRAME_HEADER_SIZE+4)) < 0)

             return ret;

-        av_dlog(s, "pos=%08"PRIx64" spos=%"PRIx64", write_index=%"PRIx64" size=%"PRIx64"\n",

+        ff_dlog(s, "pos=%08"PRIx64" spos=%"PRIx64", write_index=%"PRIx64" size=%"PRIx64"\n",

                avio_tell(s->pb), s->pb->pos, ffm->write_index, ffm->file_size);

         if (ffm_read_data(s, ffm->header, FRAME_HEADER_SIZE, 1) !=

             FRAME_HEADER_SIZE)

@@ -666,7 +667,7 @@ static int ffm_seek(AVFormatContext *s, int stream_index, int64_t wanted_pts, in

     int64_t pts_min, pts_max, pts;

     double pos1;

-    av_dlog(s, "wanted_pts=%0.6f\n", wanted_pts / 1000000.0);

+    ff_dlog(s, "wanted_pts=%0.6f\n", wanted_pts / 1000000.0);

     /* find the position using linear interpolation (better than

        dichotomy in typical cases) */

     if (ffm->write_index && ffm->write_index < ffm->file_size) {

@@ -19,6 +19,7 @@

  */

 #include "libavutil/avstring.h"

+#include "libavutil/internal.h"

 #include "libavutil/parseutils.h"

 #include "avformat.h"

 #include "internal.h"

@@ -200,7 +201,7 @@ static int ftp_send_command(FTPContext *s, const char *command,

 {

     int err;

-    av_dlog(s, "%s", command);

+    ff_dlog(s, "%s", command);

     if (response)

         *response = NULL;

@@ -283,7 +284,7 @@ static int ftp_passive_mode_epsv(FTPContext *s)

     end[-1] = '\0';

     s->server_data_port = atoi(start);

-    av_dlog(s, "Server data port: %d\n", s->server_data_port);

+    ff_dlog(s, "Server data port: %d\n", s->server_data_port);

     av_free(res);

     return 0;

@@ -329,7 +330,7 @@ static int ftp_passive_mode(FTPContext *s)

     start = av_strtok(end, ",", &end);

     if (!start) goto fail;

     s->server_data_port += atoi(start);

-    av_dlog(s, "Server data port: %d\n", s->server_data_port);

+    ff_dlog(s, "Server data port: %d\n", s->server_data_port);

     av_free(res);

     return 0;

@@ -698,7 +699,7 @@ static int ftp_open(URLContext *h, const char *url, int flags)

     FTPContext *s = h->priv_data;

     int err;

-    av_dlog(h, "ftp protocol open\n");

+    ff_dlog(h, "ftp protocol open\n");

     if ((err = ftp_connect(h, url)) < 0)

         goto fail;

@@ -726,7 +727,7 @@ static int64_t ftp_seek(URLContext *h, int64_t pos, int whence)

     int err;

     int64_t new_pos, fake_pos;

-    av_dlog(h, "ftp protocol seek %"PRId64" %d\n", pos, whence);

+    ff_dlog(h, "ftp protocol seek %"PRId64" %d\n", pos, whence);

     switch(whence) {

     case AVSEEK_SIZE:

@@ -768,7 +769,7 @@ static int ftp_read(URLContext *h, unsigned char *buf, int size)

     FTPContext *s = h->priv_data;

     int read, err, retry_done = 0;

-    av_dlog(h, "ftp protocol read %d bytes\n", size);

+    ff_dlog(h, "ftp protocol read %d bytes\n", size);

   retry:

     if (s->state == DISCONNECTED) {

         /* optimization */

@@ -826,7 +827,7 @@ static int ftp_write(URLContext *h, const unsigned char *buf, int size)

     FTPContext *s = h->priv_data;

     int written;

-    av_dlog(h, "ftp protocol write %d bytes\n", size);

+    ff_dlog(h, "ftp protocol write %d bytes\n", size);

     if (s->state == DISCONNECTED) {

         if ((err = ftp_connect_data_connection(h)) < 0)

@@ -853,7 +854,7 @@ static int ftp_close(URLContext *h)

 {

     FTPContext *s = h->priv_data;

-    av_dlog(h, "ftp protocol close\n");

+    ff_dlog(h, "ftp protocol close\n");

     ftp_close_both_connections(s);

     av_freep(&s->user);

@@ -869,7 +870,7 @@ static int ftp_get_file_handle(URLContext *h)

 {

     FTPContext *s = h->priv_data;

-    av_dlog(h, "ftp protocol get_file_handle\n");

+    ff_dlog(h, "ftp protocol get_file_handle\n");

     if (s->conn_data)

         return ffurl_get_file_handle(s->conn_data);

@@ -881,7 +882,7 @@ static int ftp_shutdown(URLContext *h, int flags)

 {

     FTPContext *s = h->priv_data;

-    av_dlog(h, "ftp protocol shutdown\n");

+    ff_dlog(h, "ftp protocol shutdown\n");

     if (s->conn_data)

         return ffurl_shutdown(s->conn_data, flags);

@@ -933,7 +934,7 @@ static int ftp_parse_entry_nlst(char *line, AVIODirEntry *next)

 static int ftp_parse_entry_mlsd(char *mlsd, AVIODirEntry *next)

 {

     char *fact, *value;

-    av_dlog(NULL, "%s\n", mlsd);

+    ff_dlog(NULL, "%s\n", mlsd);

     while(fact = av_strtok(mlsd, ";", &mlsd)) {

         if (fact[0] == ' ') {

             next->name = av_strdup(&fact[1]);

@@ -29,6 +29,7 @@

 #include "libavutil/attributes.h"

 #include "libavutil/channel_layout.h"

+#include "libavutil/internal.h"

 #include "libavutil/intreadwrite.h"

 #include "libavutil/intfloat.h"

 #include "libavutil/mathematics.h"

@@ -1393,7 +1394,7 @@ static int mov_read_aclr(MOVContext *c, AVIOContext *pb, MOVAtom atom)

                         av_log(c, AV_LOG_WARNING, "ignored unknown aclr value (%d)\n", range_value);

                         break;

                     }

-                    av_dlog(c, "color_range: %d\n", codec->color_range);

+                    ff_dlog(c, "color_range: %d\n", codec->color_range);

                 } else {

                   /* For some reason the whole atom was not added to the extradata */

                   av_log(c, AV_LOG_ERROR, "aclr not decoded - incomplete atom\n");

@@ -21,6 +21,7 @@

 #include "libavutil/buffer.h"

 #include "libavutil/crc.h"

+#include "libavutil/internal.h"

 #include "libavutil/intreadwrite.h"

 #include "libavutil/log.h"

 #include "libavutil/dict.h"

@@ -2458,7 +2459,7 @@ static int mpegts_probe(AVProbeData *p)

     sumscore = sumscore * CHECK_COUNT / check_count;

     maxscore = maxscore * CHECK_COUNT / CHECK_BLOCK;

-    av_dlog(0, "TS score: %d %d\n", sumscore, maxscore);

+    ff_dlog(0, "TS score: %d %d\n", sumscore, maxscore);

     if      (sumscore > 6) return AVPROBE_SCORE_MAX   + sumscore - CHECK_COUNT;

     else if (maxscore > 6) return AVPROBE_SCORE_MAX/2 + sumscore - CHECK_COUNT;

@@ -33,6 +33,7 @@

 #include "internal.h"

 #include "libavutil/avassert.h"

+#include "libavutil/internal.h"

 #include "libavutil/log.h"

 #include "libavutil/opt.h"

 #include "libavutil/avstring.h"

@@ -774,7 +775,7 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt)

         }

     }

-    av_dlog(s, "packet stream:%d pts:%s pts_time:%s duration_time:%s is_key:%d frame:%d\n",

+    ff_dlog(s, "packet stream:%d pts:%s pts_time:%s duration_time:%s is_key:%d frame:%d\n",

             pkt->stream_index, av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),

             av_ts2timestr(pkt->duration, &st->time_base),

             pkt->flags & AV_PKT_FLAG_KEY,

@@ -23,6 +23,7 @@

 #include "libavutil/avassert.h"

 #include "libavutil/channel_layout.h"

 #include "libavutil/imgutils.h"

+#include "libavutil/internal.h"

 #include "libavutil/intreadwrite.h"

 #include "libavcodec/get_bits.h"

 #include "swf.h"

@@ -342,7 +343,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)

             out_len = colormapsize * colormapbpp + linesize * height;

-            av_dlog(s, "bitmap: ch=%d fmt=%d %dx%d (linesize=%d) len=%d->%ld pal=%d\n",

+            ff_dlog(s, "bitmap: ch=%d fmt=%d %dx%d (linesize=%d) len=%d->%ld pal=%d\n",

                     ch_id, bmp_fmt, width, height, linesize, len, out_len, colormapsize);

             zbuf = av_malloc(len);