summaryrefslogtreecommitdiff
path: root/libavcodec/dsputil.c
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-07-20 09:46:18 +0100
committerMans Rullgard <mans@mansr.com>2011-07-20 16:13:04 +0100
commit7b4ee3a21d7c7419b485bf7af3b2795b9c3e89ea (patch)
tree86fd5f73d767442ab2b08816d50dcc02c41f1c87 /libavcodec/dsputil.c
parent89cc8a316d252d37a14906da9c170afbc7488326 (diff)
Remove h264_lowres_idct_put/add functions
Use of these has been broken ever since the h264 idct was changed to always use transposed inputs. Furthermore, they were only ever used if some *other* non-default idct was requested. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/dsputil.c')
-rw-r--r--libavcodec/dsputil.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index a3e8d6cd95..e2cf708940 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -2863,29 +2863,8 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)
#endif //CONFIG_ENCODERS
if(avctx->lowres==1){
- if(avctx->idct_algo==FF_IDCT_INT || avctx->idct_algo==FF_IDCT_AUTO || !CONFIG_H264_DECODER){
- c->idct_put= ff_jref_idct4_put;
- c->idct_add= ff_jref_idct4_add;
- }else{
- if (avctx->codec_id != CODEC_ID_H264) {
- c->idct_put= ff_h264_lowres_idct_put_8_c;
- c->idct_add= ff_h264_lowres_idct_add_8_c;
- } else {
- switch (avctx->bits_per_raw_sample) {
- case 9:
- c->idct_put= ff_h264_lowres_idct_put_9_c;
- c->idct_add= ff_h264_lowres_idct_add_9_c;
- break;
- case 10:
- c->idct_put= ff_h264_lowres_idct_put_10_c;
- c->idct_add= ff_h264_lowres_idct_add_10_c;
- break;
- default:
- c->idct_put= ff_h264_lowres_idct_put_8_c;
- c->idct_add= ff_h264_lowres_idct_add_8_c;
- }
- }
- }
+ c->idct_put= ff_jref_idct4_put;
+ c->idct_add= ff_jref_idct4_add;
c->idct = j_rev_dct4;
c->idct_permutation_type= FF_NO_IDCT_PERM;
}else if(avctx->lowres==2){