diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-08 12:53:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-08 12:53:44 +0200 |
| commit | 7beadfe1f7777574e99fd4cf6bcd7abad4fb4089 (patch) | |
| tree | 48b177a5d395f894b8ad8b99086cecf4271aedb5 /libavcodec/cavsdec.c | |
| parent | 8a0118b4b49460fb2d33b3fac765c7131816ecc7 (diff) | |
| parent | 7b699d813681e4fad419ec63c96d595e98b2dbfa (diff) | |
| download | ffmpeg-7beadfe1f7777574e99fd4cf6bcd7abad4fb4089.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov_chan: Only set the channel_layout if setting it to a nonzero value
mov_chan: Reindent an incorrectly indented line
mp2 muxer: mark as AVFMT_NOTIMESTAMPS.
x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64
x86: more specific checks for availability of required assembly capabilities
x86: avcodec: Drop silly "_mmx" suffix from dsputil template names
fate: Drop redundant setting of FUZZ to 1
cavsdsp: set idct permutation independently of dsputil
x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavsdec.c')
| -rw-r--r-- | libavcodec/cavsdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 819f2d545f..0f4f3acfa3 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -921,9 +921,10 @@ static int decode_pic(AVSContext *h) { enum cavs_mb mb_type; if (!s->context_initialized) { - s->avctx->idct_algo = FF_IDCT_CAVS; if (ff_MPV_common_init(s) < 0) return -1; + ff_init_scantable_permutation(s->dsp.idct_permutation, + h->cdsp.idct_perm); ff_init_scantable(s->dsp.idct_permutation,&h->scantable,ff_zigzag_direct); } skip_bits(&s->gb,16);//bbv_dwlay |