diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:14:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:14:41 +0100 |
| commit | 5f61e09a8f28af45d7db1f5e7767d14322255f49 (patch) | |
| tree | df4e8ce30cb60c7fe5a559529dcd2a03bdc22afb /libavcodec/mss2.c | |
| parent | db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5 (diff) | |
| parent | 93af2734ee609133eaeca28329d7f13241dd411f (diff) | |
| download | ffmpeg-5f61e09a8f28af45d7db1f5e7767d14322255f49.tar.gz | |
Merge commit '93af2734ee609133eaeca28329d7f13241dd411f'
* commit '93af2734ee609133eaeca28329d7f13241dd411f':
lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT.
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mss2.c')
| -rw-r--r-- | libavcodec/mss2.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 3de898b099..d805c7ae73 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -760,9 +760,6 @@ static av_cold int wmv9_init(AVCodecContext *avctx) avctx->flags |= CODEC_FLAG_EMU_EDGE; v->s.flags |= CODEC_FLAG_EMU_EDGE; - if (avctx->idct_algo == FF_IDCT_AUTO) - avctx->idct_algo = FF_IDCT_WMV2; - if ((ret = ff_vc1_init_common(v)) < 0) return ret; ff_vc1dsp_init(&v->vc1dsp); |