diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-28 09:27:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-28 09:28:01 +0200 |
| commit | 44187717c1611695ff441d22f29c7882bd318ae4 (patch) | |
| tree | 949776a1190eecf80b669ba277b2d83b952dd15d /libavcodec/mpegvideo.c | |
| parent | faa338183ba44051e05019411956b41c257c2510 (diff) | |
| parent | ca6a90465634152c7abe2f10112fd06dc778122f (diff) | |
| download | ffmpeg-44187717c1611695ff441d22f29c7882bd318ae4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ppc: remove redundant setting of Altivec IDCT
mpegvideo: initialise DSPContext in ff_dct_common_init()
cosmetics: reindent
eac3enc: support writing of basic mixing and info metadata
dnxhdenc: fix declarations in for loops
dsputil: remove stale bink prototypes and comments
dsputil: move a bink-only function to binkdsp
dsputil: remove some unused functions
bink: make IDCT take 32-bit input
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 6ebaef8341..441379d198 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -155,6 +155,8 @@ const uint8_t *ff_find_start_code(const uint8_t * restrict p, const uint8_t *end /* init common dct for both encoder and decoder */ av_cold int ff_dct_common_init(MpegEncContext *s) { + dsputil_init(&s->dsp, s->avctx); + s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c; s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c; s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_c; @@ -603,7 +605,6 @@ av_cold int MPV_common_init(MpegEncContext *s) if((s->width || s->height) && av_image_check_size(s->width, s->height, 0, s->avctx)) return -1; - dsputil_init(&s->dsp, s->avctx); ff_dct_common_init(s); s->flags= s->avctx->flags; |