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/drawutils.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/drawutils.c')
| -rw-r--r-- | libavfilter/drawutils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index 4214fc8413..23ab17aa28 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -55,7 +55,7 @@ int ff_fill_line_with_color(uint8_t *line[4], int pixel_step[4], int w, uint8_t { uint8_t rgba_map[4] = {0}; int i; - const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[pix_fmt]; + const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(pix_fmt); int hsub = pix_desc->log2_chroma_w; *is_packed_rgba = ff_fill_rgba_map(rgba_map, pix_fmt) >= 0; @@ -134,7 +134,7 @@ void ff_copy_rectangle(uint8_t *dst[4], int dst_linesize[4], int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags) { - const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[format]; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format); const AVComponentDescriptor *c; unsigned i, nb_planes = 0; int pixelstep[MAX_PLANES] = { 0 }; @@ -525,7 +525,7 @@ int main(void) int r, i; for (f = 0; f < AV_PIX_FMT_NB; f++) { - desc = &av_pix_fmt_descriptors[f]; + desc = av_pix_fmt_desc_get(f); if (!desc->name) continue; printf("Testing %s...%*s", desc->name, |