diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-08-17 20:45:35 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2015-08-18 10:24:01 -0400 |
| commit | 229843aa359ae0c9519977d7fa952688db63f559 (patch) | |
| tree | f931598935b67d8d9b2a64190876a9b829e1f287 /libavdevice | |
| parent | ad7d972e08dddb1788ac6a434d1be314febcb09d (diff) | |
| download | ffmpeg-229843aa359ae0c9519977d7fa952688db63f559.tar.gz | |
Replace av_dlog with ff_dlog.
ff_dlog checks compilability, and is non-public. av_dlog is deprecated
and no longer exists if FF_API_DLOG=0.
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/lavfi.c | 7 | ||||
| -rw-r--r-- | libavdevice/v4l.c | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 0160f9fac8..d92e2996fd 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -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]; diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c index d33f7142a0..81653e02fb 100644 --- a/libavdevice/v4l.c +++ b/libavdevice/v4l.c @@ -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; |