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_unsharp.c | |
| parent | af7dd79a323090b14a7fb9ef24a3f6a24dc6d2db (diff) | |
| parent | 59ee9f78b0cc4fb84ae606fa317d8102ad32a627 (diff) | |
| download | ffmpeg-13afee951a49964abb6d3e2d11644ac9d5ded2c7.tar.gz | |
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_unsharp.c')
| -rw-r--r-- | libavfilter/vf_unsharp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index 15c91699d5..6635ca4b8e 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -187,9 +187,10 @@ static void init_filter_param(AVFilterContext *ctx, FilterParam *fp, const char static int config_props(AVFilterLink *link) { UnsharpContext *unsharp = link->dst->priv; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format); - unsharp->hsub = av_pix_fmt_descriptors[link->format].log2_chroma_w; - unsharp->vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h; + unsharp->hsub = desc->log2_chroma_w; + unsharp->vsub = desc->log2_chroma_h; init_filter_param(link->dst, &unsharp->luma, "luma", link->w); init_filter_param(link->dst, &unsharp->chroma, "chroma", SHIFTUP(link->w, unsharp->hsub)); |