diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 17:04:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 17:04:58 +0200 |
| commit | 13afee951a49964abb6d3e2d11644ac9d5ded2c7 (patch) | |
| tree | ba98a70ac6f80dea08f21badfbbb64319541d826 /libavfilter/vf_transpose.c | |
| parent | af7dd79a323090b14a7fb9ef24a3f6a24dc6d2db (diff) | |
| parent | 59ee9f78b0cc4fb84ae606fa317d8102ad32a627 (diff) | |
Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'
* commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627':
lavfi: do not use av_pix_fmt_descriptors directly.
Conflicts:
libavfilter/buffersrc.c
libavfilter/drawutils.c
libavfilter/filtfmts.c
libavfilter/vf_ass.c
libavfilter/vf_boxblur.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_transpose.c')
| -rw-r--r-- | libavfilter/vf_transpose.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index 1c9ccf5ac6..dc2ee2128c 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -116,7 +116,8 @@ static int config_props_output(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; TransContext *trans = ctx->priv; AVFilterLink *inlink = ctx->inputs[0]; - const AVPixFmtDescriptor *pixdesc = &av_pix_fmt_descriptors[outlink->format]; + const AVPixFmtDescriptor *desc_out = av_pix_fmt_desc_get(outlink->format); + const AVPixFmtDescriptor *desc_in = av_pix_fmt_desc_get(inlink->format); if (trans->dir&4) { av_log(ctx, AV_LOG_WARNING, @@ -135,10 +136,10 @@ static int config_props_output(AVFilterLink *outlink) trans->passthrough = TRANSPOSE_PT_TYPE_NONE; } - trans->hsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_w; - trans->vsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_h; + trans->hsub = desc_in->log2_chroma_w; + trans->vsub = desc_in->log2_chroma_h; - av_image_fill_max_pixsteps(trans->pixsteps, NULL, pixdesc); + av_image_fill_max_pixsteps(trans->pixsteps, NULL, desc_out); outlink->w = inlink->h; outlink->h = inlink->w; |