diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 15:27:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 15:36:58 +0200 |
| commit | 020865f557ccf06a41ecc461fd13ce6678817d04 (patch) | |
| tree | 657a0da279922b830200908b6e620be025e20b85 /libavcodec/svq1enc.c | |
| parent | 462c6cdb8ed256d2063815b67ca4d14e62e25802 (diff) | |
| parent | c166148409fe8f0dbccef2fe684286a40ba1e37d (diff) | |
| download | ffmpeg-020865f557ccf06a41ecc461fd13ce6678817d04.tar.gz | |
Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'
* commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d':
dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc
Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq1enc.c')
| -rw-r--r-- | libavcodec/svq1enc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 6d1b397fd2..9ff690dce2 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -517,6 +517,7 @@ static av_cold int svq1_encode_init(AVCodecContext *avctx) ff_dsputil_init(&s->dsp, avctx); ff_hpeldsp_init(&s->hdsp, avctx->flags); + ff_mpegvideoencdsp_init(&s->m.mpvencdsp, avctx); avctx->coded_frame = av_frame_alloc(); s->current_picture = av_frame_alloc(); |