X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Favfilter.c;h=08b86b010dc35ce7bc9920e86f86b076d80ac139;hb=9d45454cd09a05e8016a47851b9eb92e10321036;hp=ecfb872ed80b7904966ab1c930accfa96af258c7;hpb=8c71d1b06028b1de2558647f7db7421d1c6e9bee;p=ffmpeg diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index ecfb872ed80..08b86b010dc 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -53,7 +53,7 @@ void ff_tlog_ref(void *ctx, AVFrame *ref, int end) "ref[%p buf:%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64, ref, ref->buf, ref->data[0], ref->linesize[0], ref->linesize[1], ref->linesize[2], ref->linesize[3], - ref->pts, av_frame_get_pkt_pos(ref)); + ref->pts, ref->pkt_pos); if (ref->width) { ff_tlog(ctx, " a:%d/%d s:%dx%d i:%c iskey:%d type:%c", @@ -1143,7 +1143,7 @@ int ff_filter_frame(AVFilterLink *link, AVFrame *frame) av_log(link->dst, AV_LOG_ERROR, "Format change is not supported\n"); goto error; } - if (av_frame_get_channels(frame) != link->channels) { + if (frame->channels != link->channels) { av_log(link->dst, AV_LOG_ERROR, "Channel count change is not supported\n"); goto error; } @@ -1585,7 +1585,7 @@ int ff_inlink_make_frame_writable(AVFilterLink *link, AVFrame **rframe) case AVMEDIA_TYPE_AUDIO: av_samples_copy(out->extended_data, frame->extended_data, 0, 0, frame->nb_samples, - av_frame_get_channels(frame), + frame->channels, frame->format); break; default: @@ -1616,7 +1616,7 @@ int ff_inlink_evaluate_timeline_at_frame(AVFilterLink *link, const AVFrame *fram { AVFilterContext *dstctx = link->dst; int64_t pts = frame->pts; - int64_t pos = av_frame_get_pkt_pos(frame); + int64_t pos = frame->pkt_pos; if (!dstctx->enable_str) return 1;