Browse Source

avcodec/lossless_videodsp: Pass AVCodecContext to init

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
commit
eaacfc7dd1
4 changed files with 7 additions and 6 deletions
  1. +1
    -1
      libavcodec/huffyuv.c
  2. +2
    -2
      libavcodec/lossless_videodsp.c
  3. +2
    -2
      libavcodec/lossless_videodsp.h
  4. +2
    -1
      libavcodec/x86/lossless_videodsp_init.c

+ 1
- 1
libavcodec/huffyuv.c View File

@@ -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;


+ 2
- 2
libavcodec/lossless_videodsp.c View File

@@ -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);
}

+ 2
- 2
libavcodec/lossless_videodsp.h View File

@@ -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

+ 2
- 1
libavcodec/x86/lossless_videodsp_init.c View File

@@ -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();



Loading…
Cancel
Save