Mercurial > libavcodec.hg
comparison x86/dsputil_mmx.c @ 12439:51fc247eed32 libavcodec
Fix compilation failure if yasm is disabled (missing vp3 symbols).
| author | rbultje |
|---|---|
| date | Mon, 30 Aug 2010 20:30:40 +0000 |
| parents | b242eb86ea9a |
| children | 3941687b4fa9 |
comparison
equal
deleted
inserted
replaced
| 12438:33ecda76b2f2 | 12439:51fc247eed32 |
|---|---|
| 2607 c->idct = ff_mmx_idct; | 2607 c->idct = ff_mmx_idct; |
| 2608 } | 2608 } |
| 2609 c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; | 2609 c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; |
| 2610 #endif | 2610 #endif |
| 2611 }else if((CONFIG_VP3_DECODER || CONFIG_VP5_DECODER || CONFIG_VP6_DECODER) && | 2611 }else if((CONFIG_VP3_DECODER || CONFIG_VP5_DECODER || CONFIG_VP6_DECODER) && |
| 2612 idct_algo==FF_IDCT_VP3){ | 2612 idct_algo==FF_IDCT_VP3 && HAVE_YASM){ |
| 2613 if(mm_flags & FF_MM_SSE2){ | 2613 if(mm_flags & FF_MM_SSE2){ |
| 2614 c->idct_put= ff_vp3_idct_put_sse2; | 2614 c->idct_put= ff_vp3_idct_put_sse2; |
| 2615 c->idct_add= ff_vp3_idct_add_sse2; | 2615 c->idct_add= ff_vp3_idct_add_sse2; |
| 2616 c->idct = ff_vp3_idct_sse2; | 2616 c->idct = ff_vp3_idct_sse2; |
| 2617 c->idct_permutation_type= FF_TRANSPOSE_IDCT_PERM; | 2617 c->idct_permutation_type= FF_TRANSPOSE_IDCT_PERM; |
| 2712 c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_mmx2; | 2712 c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_mmx2; |
| 2713 c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_mmx2; | 2713 c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_mmx2; |
| 2714 c->avg_pixels_tab[0][3] = avg_pixels16_xy2_mmx2; | 2714 c->avg_pixels_tab[0][3] = avg_pixels16_xy2_mmx2; |
| 2715 c->avg_pixels_tab[1][3] = avg_pixels8_xy2_mmx2; | 2715 c->avg_pixels_tab[1][3] = avg_pixels8_xy2_mmx2; |
| 2716 | 2716 |
| 2717 if (CONFIG_VP3_DECODER) { | 2717 if (CONFIG_VP3_DECODER && HAVE_YASM) { |
| 2718 c->vp3_v_loop_filter= ff_vp3_v_loop_filter_mmx2; | 2718 c->vp3_v_loop_filter= ff_vp3_v_loop_filter_mmx2; |
| 2719 c->vp3_h_loop_filter= ff_vp3_h_loop_filter_mmx2; | 2719 c->vp3_h_loop_filter= ff_vp3_h_loop_filter_mmx2; |
| 2720 } | 2720 } |
| 2721 } | 2721 } |
| 2722 if (CONFIG_VP3_DECODER) { | 2722 if (CONFIG_VP3_DECODER && HAVE_YASM) { |
| 2723 c->vp3_idct_dc_add = ff_vp3_idct_dc_add_mmx2; | 2723 c->vp3_idct_dc_add = ff_vp3_idct_dc_add_mmx2; |
| 2724 } | 2724 } |
| 2725 | 2725 |
| 2726 if (CONFIG_VP3_DECODER | 2726 if (CONFIG_VP3_DECODER |
| 2727 && (avctx->codec_id == CODEC_ID_VP3 || avctx->codec_id == CODEC_ID_THEORA)) { | 2727 && (avctx->codec_id == CODEC_ID_VP3 || avctx->codec_id == CODEC_ID_THEORA)) { |