diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 15:34:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:07:21 +0100 |
| commit | db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5 (patch) | |
| tree | 01b9286e8a7d1e83c4b8d734d7767a3115838561 /libavcodec/wmv2dec.c | |
| parent | 2cf9ab655549cf2f25ba57ee84baa6d38530ec3b (diff) | |
| parent | e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0 (diff) | |
| download | ffmpeg-db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5.tar.gz | |
Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'
* commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0':
wmv2: move IDCT to its own DSP context.
Conflicts:
libavcodec/dsputil.h
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth1-wmv2
tests/ref/vsynth/vsynth2-wmv2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmv2dec.c')
| -rw-r--r-- | libavcodec/wmv2dec.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index df11c219da..dccdd54b6c 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -447,10 +447,6 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) static av_cold int wmv2_decode_init(AVCodecContext *avctx){ Wmv2Context * const w= avctx->priv_data; - if(avctx->idct_algo==FF_IDCT_AUTO){ - avctx->idct_algo=FF_IDCT_WMV2; - } - if(ff_msmpeg4_decode_init(avctx) < 0) return -1; |