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/mpegvideo_enc.c | |
| parent | 8b6cbc3c3319f7942d679d6f6319971c102cfbd3 (diff) | |
| parent | 998c9f15d1ca8c7489775ebcca51623b915988f1 (diff) | |
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/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index eefde7aaa7..774e235dd4 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -837,6 +837,7 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx) s->alternate_scan); /* init */ + ff_mpv_idct_init(s); if (ff_MPV_common_init(s) < 0) return -1; |