Showing the changes to libavfilter/avfilter.c (1 of 52 files). Show all
Unified · Split
| @@ -53,7 +53,7 @@ void ff_tlog_ref(void *ctx, AVFrame *ref, int end) · 52 unmodified lines | ||
| 53 | 53 | "ref[%p buf:%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64, |
| 54 | 54 | ref, ref->buf, ref->data[0], |
| 55 | 55 | ref->linesize[0], ref->linesize[1], ref->linesize[2], ref->linesize[3], |
| 56 | − ref->pts, av_frame_get_pkt_pos(ref)); | |
| 56 | + ref->pts, ref->pkt_pos); | |
| 57 | 57 | |
| 58 | 58 | if (ref->width) { |
| 59 | 59 | 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) · 1083 unmodified lines | ||
| 1143 | 1143 | av_log(link->dst, AV_LOG_ERROR, "Format change is not supported\n"); |
| 1144 | 1144 | goto error; |
| 1145 | 1145 | } |
| 1146 | − if (av_frame_get_channels(frame) != link->channels) { | |
| 1146 | + if (frame->channels != link->channels) { | |
| 1147 | 1147 | av_log(link->dst, AV_LOG_ERROR, "Channel count change is not supported\n"); |
| 1148 | 1148 | goto error; |
| 1149 | 1149 | } |
| @@ -1585,7 +1585,7 @@ int ff_inlink_make_frame_writable(AVFilterLink *link, AVFrame **rframe) · 435 unmodified lines | ||
| 1585 | 1585 | case AVMEDIA_TYPE_AUDIO: |
| 1586 | 1586 | av_samples_copy(out->extended_data, frame->extended_data, |
| 1587 | 1587 | 0, 0, frame->nb_samples, |
| 1588 | − av_frame_get_channels(frame), | |
| 1588 | + frame->channels, | |
| 1589 | 1589 | frame->format); |
| 1590 | 1590 | break; |
| 1591 | 1591 | default: |
| @@ -1616,7 +1616,7 @@ int ff_inlink_evaluate_timeline_at_frame(AVFilterLink *link, const AVFrame *fram · 24 unmodified lines | ||
| 1616 | 1616 | { |
| 1617 | 1617 | AVFilterContext *dstctx = link->dst; |
| 1618 | 1618 | int64_t pts = frame->pts; |
| 1619 | − int64_t pos = av_frame_get_pkt_pos(frame); | |
| 1619 | + int64_t pos = frame->pkt_pos; | |
| 1620 | 1620 | |
| 1621 | 1621 | if (!dstctx->enable_str) |
| 1622 | 1622 | return 1; |