summaryrefslogtreecommitdiff
path: root/libavcodec/bink.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-21 16:14:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-21 16:14:41 +0100
commit5f61e09a8f28af45d7db1f5e7767d14322255f49 (patch)
treedf4e8ce30cb60c7fe5a559529dcd2a03bdc22afb /libavcodec/bink.c
parentdb23d5de27187dd8f2ec5c6dfd98a8a363b0fda5 (diff)
parent93af2734ee609133eaeca28329d7f13241dd411f (diff)
downloadffmpeg-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/bink.c')
-rw-r--r--libavcodec/bink.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/bink.c b/libavcodec/bink.c
index 2c28495685..892e92184b 100644
--- a/libavcodec/bink.c
+++ b/libavcodec/bink.c
@@ -1300,7 +1300,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->pix_fmt = c->has_alpha ? AV_PIX_FMT_YUVA420P : AV_PIX_FMT_YUV420P;
- avctx->idct_algo = FF_IDCT_BINK;
ff_dsputil_init(&c->dsp, avctx);
ff_binkdsp_init(&c->bdsp);