diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 02:08:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 02:25:14 +0200 |
| commit | 2fd87a3d7895ce36e558a306d03e33697d456086 (patch) | |
| tree | 99a9b5ef8a07475a55d89050993a0071e9ea4008 /libavcodec/dnxhdenc.c | |
| parent | 8b6cbc3c3319f7942d679d6f6319971c102cfbd3 (diff) | |
| parent | 998c9f15d1ca8c7489775ebcca51623b915988f1 (diff) | |
| download | ffmpeg-streaming-2fd87a3d7895ce36e558a306d03e33697d456086.zip ffmpeg-streaming-2fd87a3d7895ce36e558a306d03e33697d456086.tar.gz | |
Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'
* commit '998c9f15d1ca8c7489775ebcca51623b915988f1':
idct: remove call to ff_idctdsp_init from ff_MPV_common_init
Conflicts:
libavcodec/dnxhdenc.c
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhdenc.c')
| -rw-r--r-- | libavcodec/dnxhdenc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 3ad6253..3388f51 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -324,10 +324,9 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) ff_blockdsp_init(&ctx->bdsp, avctx); ff_fdctdsp_init(&ctx->m.fdsp, avctx); - ff_idctdsp_init(&ctx->m.idsp, avctx); + ff_mpv_idct_init(&ctx->m); ff_mpegvideoencdsp_init(&ctx->m.mpvencdsp, avctx); ff_pixblockdsp_init(&ctx->m.pdsp, avctx); - ff_dct_common_init(&ctx->m); ff_dct_encode_init(&ctx->m); if (!ctx->m.dct_quantize) |
