Improve consistency with libavcodec. This breaks libavfilter API/ABI. The non-sequential 2.1.0 -> 2.4.0 bump is due to the mess previously done with the lavfi minor number.
Showing the changes to libavfilter/vsrc_buffer.c (1 of 14 files). Show all
Unified · Split
| @@ -34,7 +34,7 @@ typedef struct { · 33 unmodified lines | ||
| 34 | 34 | int h, w; |
| 35 | 35 | enum PixelFormat pix_fmt; |
| 36 | 36 | AVRational time_base; ///< time_base to set in the output link |
| 37 | − AVRational pixel_aspect; | |
| 37 | + AVRational sample_aspect_ratio; | |
| 38 | 38 | char sws_param[256]; |
| 39 | 39 | } BufferSourceContext; |
| 40 | 40 | |
| @@ -130,7 +130,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) · 89 unmodified lines | ||
| 130 | 130 | if (!args || |
| 131 | 131 | (n = sscanf(args, "%d:%d:%127[^:]:%d:%d:%d:%d", &c->w, &c->h, pix_fmt_str, |
| 132 | 132 | &c->time_base.num, &c->time_base.den, |
| 133 | − &c->pixel_aspect.num, &c->pixel_aspect.den)) != 7) { | |
| 133 | + &c->sample_aspect_ratio.num, &c->sample_aspect_ratio.den)) != 7) { | |
| 134 | 134 | av_log(ctx, AV_LOG_ERROR, "Expected 7 arguments, but only %d found in '%s'\n", n, args); |
| 135 | 135 | return AVERROR(EINVAL); |
| 136 | 136 | } |
| @@ -162,7 +162,7 @@ static int config_props(AVFilterLink *link) · 25 unmodified lines | ||
| 162 | 162 | |
| 163 | 163 | link->w = c->w; |
| 164 | 164 | link->h = c->h; |
| 165 | − link->sample_aspect_ratio = c->pixel_aspect; | |
| 165 | + link->sample_aspect_ratio = c->sample_aspect_ratio; | |
| 166 | 166 | link->time_base = c->time_base; |
| 167 | 167 | |
| 168 | 168 | return 0; |
| @@ -190,7 +190,7 @@ static int request_frame(AVFilterLink *link) · 21 unmodified lines | ||
| 190 | 190 | picref->format, link->w, link->h); |
| 191 | 191 | |
| 192 | 192 | picref->pts = c->pts; |
| 193 | − picref->video->pixel_aspect = c->frame.sample_aspect_ratio; | |
| 193 | + picref->video->sample_aspect_ratio = c->frame.sample_aspect_ratio; | |
| 194 | 194 | picref->video->interlaced = c->frame.interlaced_frame; |
| 195 | 195 | picref->video->top_field_first = c->frame.top_field_first; |
| 196 | 196 | picref->video->key_frame = c->frame.key_frame; |