diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:18:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:18:43 +0100 |
| commit | a41bf09d9c56215448f14fb086c9f882eb41ecac (patch) | |
| tree | 541da01619d95763ff0ee46ae0df50125505b3c4 /libavcodec/vp3.c | |
| parent | fb3f28ee289b9ea5106d5a7fa00a1018eb379e65 (diff) | |
| parent | 6906b19346ae8a330bfaa1c16ce535be10789723 (diff) | |
| download | ffmpeg-a41bf09d9c56215448f14fb086c9f882eb41ecac.tar.gz | |
Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'
* commit '6906b19346ae8a330bfaa1c16ce535be10789723':
lavc: add missing files for arm
lavc: introduce VideoDSPContext
Conflicts:
configure
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 34061016a9..d4425bc477 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -38,7 +38,7 @@ #include "internal.h" #include "dsputil.h" #include "get_bits.h" - +#include "videodsp.h" #include "vp3data.h" #include "vp3dsp.h" #include "xiph.h" @@ -136,6 +136,7 @@ typedef struct Vp3DecodeContext { AVFrame current_frame; int keyframe; DSPContext dsp; + VideoDSPContext vdsp; VP3DSPContext vp3dsp; int flipped_image; int last_slice_end; @@ -1543,7 +1544,7 @@ static void render_slice(Vp3DecodeContext *s, int slice) uint8_t *temp= s->edge_emu_buffer; if(stride<0) temp -= 8*stride; - s->dsp.emulated_edge_mc(temp, motion_source, stride, 9, 9, src_x, src_y, plane_width, plane_height); + s->vdsp.emulated_edge_mc(temp, motion_source, stride, 9, 9, src_x, src_y, plane_width, plane_height); motion_source= temp; } } @@ -1671,6 +1672,7 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; ff_dsputil_init(&s->dsp, avctx); + ff_videodsp_init(&s->vdsp, 8); ff_vp3dsp_init(&s->vp3dsp, avctx->flags); ff_init_scantable_permutation(s->dsp.idct_permutation, s->vp3dsp.idct_perm); |