diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-23 01:34:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-23 01:43:00 +0100 |
| commit | eaacfc7dd1eaeec7e5e243f1e0ee5e8a7ff845a3 (patch) | |
| tree | 9160fb7e3db89b6dbee16e902170dcb6681725a1 /libavcodec | |
| parent | 622d463000371467cb0365744f0c1d92b56bed52 (diff) | |
avcodec/lossless_videodsp: Pass AVCodecContext to init
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/huffyuv.c | 2 | ||||
| -rw-r--r-- | libavcodec/lossless_videodsp.c | 4 | ||||
| -rw-r--r-- | libavcodec/lossless_videodsp.h | 4 | ||||
| -rw-r--r-- | libavcodec/x86/lossless_videodsp_init.c | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index 8b0dcdcc6e..d6396bacf7 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -81,7 +81,7 @@ av_cold void ff_huffyuv_common_init(AVCodecContext *avctx) s->flags = avctx->flags; ff_dsputil_init(&s->dsp, avctx); - ff_llviddsp_init(&s->llviddsp); + ff_llviddsp_init(&s->llviddsp, avctx); s->width = avctx->width; s->height = avctx->height; diff --git a/libavcodec/lossless_videodsp.c b/libavcodec/lossless_videodsp.c index 197f63e066..aa1e7df84c 100644 --- a/libavcodec/lossless_videodsp.c +++ b/libavcodec/lossless_videodsp.c @@ -115,7 +115,7 @@ static int add_hfyu_left_prediction_int16_c(uint16_t *dst, const uint16_t *src, } -void ff_llviddsp_init(LLVidDSPContext *c) +void ff_llviddsp_init(LLVidDSPContext *c, AVCodecContext *avctx) { c->add_int16 = add_int16_c; c->diff_int16= diff_int16_c; @@ -124,5 +124,5 @@ void ff_llviddsp_init(LLVidDSPContext *c) c->sub_hfyu_median_prediction_int16 = sub_hfyu_median_prediction_int16_c; if (ARCH_X86) - ff_llviddsp_init_x86(c); + ff_llviddsp_init_x86(c, avctx); } diff --git a/libavcodec/lossless_videodsp.h b/libavcodec/lossless_videodsp.h index e4dfca3d33..c656fa14cf 100644 --- a/libavcodec/lossless_videodsp.h +++ b/libavcodec/lossless_videodsp.h @@ -34,7 +34,7 @@ typedef struct LLVidDSPContext { int (*add_hfyu_left_prediction_int16)(uint16_t *dst, const uint16_t *src, unsigned mask, int w, int left); } LLVidDSPContext; -void ff_llviddsp_init(LLVidDSPContext *llviddsp); -void ff_llviddsp_init_x86(LLVidDSPContext *llviddsp); +void ff_llviddsp_init(LLVidDSPContext *llviddsp, AVCodecContext *avctx); +void ff_llviddsp_init_x86(LLVidDSPContext *llviddsp, AVCodecContext *avctx); #endif //AVCODEC_LOSSLESS_VIDEODSP_H diff --git a/libavcodec/x86/lossless_videodsp_init.c b/libavcodec/x86/lossless_videodsp_init.c index 368f0721ee..fe88c4ebcc 100644 --- a/libavcodec/x86/lossless_videodsp_init.c +++ b/libavcodec/x86/lossless_videodsp_init.c @@ -19,6 +19,7 @@ */ #include "../lossless_videodsp.h" +#include "libavutil/pixdesc.h" #include "libavutil/x86/cpu.h" void ff_add_int16_mmx(uint16_t *dst, const uint16_t *src, unsigned mask, int w); @@ -31,7 +32,7 @@ void ff_add_hfyu_median_prediction_int16_mmxext(uint16_t *dst, const uint16_t *t void ff_sub_hfyu_median_prediction_int16_mmxext(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w, int *left, int *left_top); -void ff_llviddsp_init_x86(LLVidDSPContext *c) +void ff_llviddsp_init_x86(LLVidDSPContext *c, AVCodecContext *avctx) { int cpu_flags = av_get_cpu_flags(); |