diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-10-20 06:43:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-20 18:00:13 +0200 |
| commit | 79393a8363d6bb9920754247df00f1b5259e6efd (patch) | |
| tree | a8991d78db0652fc3b004ade2f3c3a0365f9fda3 /libswscale | |
| parent | 2c5b92fe90463402be6bf611ef40195f86f434fd (diff) | |
| download | ffmpeg-79393a8363d6bb9920754247df00f1b5259e6efd.tar.gz | |
Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale_internal.h | 4 | ||||
| -rw-r--r-- | libswscale/x86/swscale.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 9a7baab7a2..b3f20ccca0 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -602,8 +602,8 @@ static av_always_inline int isRGB(enum AVPixelFormat pix_fmt) #if 0 // FIXME #define isGray(x) \ - (!(av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) && \ - av_pix_fmt_descriptors[x].nb_components <= 2) + (!(av_pix_fmt_desc_get(x)->flags & PIX_FMT_PAL) && \ + av_pix_fmt_desc_get(x)->nb_components <= 2) #else #define isGray(x) \ ((x) == AV_PIX_FMT_GRAY8 || \ diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index e6a0123eb9..56ef3bc3a0 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -402,7 +402,7 @@ av_cold void ff_sws_init_swScale_mmx(SwsContext *c) } else if (c->srcBpc == 12) { \ hscalefn = c->dstBpc <= 14 ? ff_hscale12to15_ ## filtersize ## _ ## opt2 : \ ff_hscale12to19_ ## filtersize ## _ ## opt1; \ - } else if (c->srcBpc == 14 || ((c->srcFormat==AV_PIX_FMT_PAL8||isAnyRGB(c->srcFormat)) && av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1<15)) { \ + } else if (c->srcBpc == 14 || ((c->srcFormat==AV_PIX_FMT_PAL8||isAnyRGB(c->srcFormat)) && av_pix_fmt_desc_get(c->srcFormat)->comp[0].depth_minus1<15)) { \ hscalefn = c->dstBpc <= 14 ? ff_hscale14to15_ ## filtersize ## _ ## opt2 : \ ff_hscale14to19_ ## filtersize ## _ ## opt1; \ } else { /* c->srcBpc == 16 */ \ |