diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-20 22:12:35 -0800 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-20 22:12:35 -0800 |
commit | e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0 (patch) | |
tree | 372ff5d7a56c1ea732d01ee4051293bf0309162b /libavcodec/wmv2dec.c | |
parent | 8a4f26206d7914eaf2903954ce97cb7686933382 (diff) | |
download | ffmpeg-e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0.tar.gz |
wmv2: move IDCT to its own DSP context.
This allows us to remove FF_IDCT_WMV2, which serves no practical purpose
other than to be able to select the WMV2 IDCT for MPEG (or vice versa)
and get corrupt output.
Fate tests for all wmv2-related tests change, because (for some obscure
reason) they forced use of the MPEG IDCT. You would get the same changes
previously by not using -idct simple in the fate test (or replacing it
with -idct auto).
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 c1fd4ee0a3..077928357e 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; |