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/video.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/video.c')
| -rw-r--r-- | libavfilter/video.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/video.c b/libavfilter/video.c index 7bab974c66..ebc8cf4fc6 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -373,7 +373,8 @@ int ff_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) /* copy the slice if needed for permission reasons */ if (link->src_buf) { - vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format); + vsub = desc->log2_chroma_h; for (i = 0; i < 4; i++) { if (link->src_buf->data[i]) { |