diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 13:38:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 13:38:57 +0100 |
| commit | a85311ef841b87ddaacf7c198f422db5c1ac2d60 (patch) | |
| tree | 0c39d27f14ae7168bbc36f57d049a964c6e63a12 /libavcodec/dsputil.c | |
| parent | 098d3891be08ca119e20ad7989668ddef83b31ea (diff) | |
| parent | 68f18f03519ae550e25cf12661172641e9f0eaca (diff) | |
Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'
* commit '68f18f03519ae550e25cf12661172641e9f0eaca':
videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
dsputil: drop non-compliant "fast" qpel mc functions
get_bits: change the failure condition in init_get_bits
Conflicts:
libavcodec/get_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 4b3db63707..db2f6f2358 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2790,8 +2790,6 @@ int ff_check_alignment(void){ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) { - int i, j; - ff_check_alignment(); #if CONFIG_ENCODERS @@ -3013,9 +3011,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->shrink[2]= ff_shrink44; c->shrink[3]= ff_shrink88; - memset(c->put_2tap_qpel_pixels_tab, 0, sizeof(c->put_2tap_qpel_pixels_tab)); - memset(c->avg_2tap_qpel_pixels_tab, 0, sizeof(c->avg_2tap_qpel_pixels_tab)); - #undef FUNC #undef FUNCC #define FUNC(f, depth) f ## _ ## depth @@ -3128,17 +3123,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) if (ARCH_SH4) ff_dsputil_init_sh4 (c, avctx); if (ARCH_BFIN) ff_dsputil_init_bfin (c, avctx); - for (i = 0; i < 4; i++) { - for (j = 0; j < 16; j++) { - if(!c->put_2tap_qpel_pixels_tab[i][j]) - c->put_2tap_qpel_pixels_tab[i][j] = - c->put_h264_qpel_pixels_tab[i][j]; - if(!c->avg_2tap_qpel_pixels_tab[i][j]) - c->avg_2tap_qpel_pixels_tab[i][j] = - c->avg_h264_qpel_pixels_tab[i][j]; - } - } - ff_init_scantable_permutation(c->idct_permutation, c->idct_permutation_type); } |